diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/ui/input-group.reel | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/ui/input-group.reel')
| -rwxr-xr-x | js/components/ui/input-group.reel/input-group.html | 2 | ||||
| -rwxr-xr-x | js/components/ui/input-group.reel/input-group.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html index f8dd2483..ae1be39d 100755 --- a/js/components/ui/input-group.reel/input-group.html +++ b/js/components/ui/input-group.reel/input-group.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/js/components/ui/input-group.reel/input-group.js b/js/components/ui/input-group.reel/input-group.js index ba0eea43..df3a81c4 100755 --- a/js/components/ui/input-group.reel/input-group.js +++ b/js/components/ui/input-group.reel/input-group.js | |||
| @@ -84,7 +84,7 @@ var InputGroup = exports.InputGroup = Montage.create(Component, { | |||
| 84 | this.dispatchEvent(propEvent); | 84 | this.dispatchEvent(propEvent); |
| 85 | } | 85 | } |
| 86 | }, | 86 | }, |
| 87 | 87 | ||
| 88 | value: { | 88 | value: { |
| 89 | enumerable: true, | 89 | enumerable: true, |
| 90 | serializable: true, | 90 | serializable: true, |
| @@ -96,7 +96,7 @@ var InputGroup = exports.InputGroup = Montage.create(Component, { | |||
| 96 | retObject[childControl.label] = childControl._control[childControl._prop]; | 96 | retObject[childControl.label] = childControl._control[childControl._prop]; |
| 97 | } | 97 | } |
| 98 | return retObject; | 98 | return retObject; |
| 99 | 99 | ||
| 100 | } | 100 | } |
| 101 | }, | 101 | }, |
| 102 | 102 | ||