aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/input-group.reel/input-group.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/ui/input-group.reel/input-group.js
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/ui/input-group.reel/input-group.js')
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.js4
1 files changed, 2 insertions, 2 deletions
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