diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage/ui/input-checkbox.reel | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-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 'node_modules/montage/ui/input-checkbox.reel')
| -rw-r--r-- | node_modules/montage/ui/input-checkbox.reel/input-checkbox.html | 2 | ||||
| -rw-r--r-- | node_modules/montage/ui/input-checkbox.reel/input-checkbox.js | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/node_modules/montage/ui/input-checkbox.reel/input-checkbox.html b/node_modules/montage/ui/input-checkbox.reel/input-checkbox.html index b85a5399..a6b3847d 100644 --- a/node_modules/montage/ui/input-checkbox.reel/input-checkbox.html +++ b/node_modules/montage/ui/input-checkbox.reel/input-checkbox.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/node_modules/montage/ui/input-checkbox.reel/input-checkbox.js b/node_modules/montage/ui/input-checkbox.reel/input-checkbox.js index d0c32821..b446d7b9 100644 --- a/node_modules/montage/ui/input-checkbox.reel/input-checkbox.js +++ b/node_modules/montage/ui/input-checkbox.reel/input-checkbox.js | |||
| @@ -30,20 +30,20 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 30 | /*global require,exports */ | 30 | /*global require,exports */ |
| 31 | var Montage = require("montage").Montage, | 31 | var Montage = require("montage").Montage, |
| 32 | Component = require("ui/component").Component, | 32 | Component = require("ui/component").Component, |
| 33 | NativeInputCheckbox = require("ui/native/input-checkbox.reel").InputCheckbox; | 33 | NativeInputCheckbox = require("ui/native/input-checkbox.reel").InputCheckbox; |
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| 36 | * Input Checkbox | 36 | * Input Checkbox |
| 37 | */ | 37 | */ |
| 38 | exports.InputCheckbox = Montage.create(NativeInputCheckbox, { | 38 | exports.InputCheckbox = Montage.create(NativeInputCheckbox, { |
| 39 | 39 | ||
| 40 | hasTemplate: {value: true}, | 40 | hasTemplate: {value: true}, |
| 41 | 41 | ||
| 42 | didSetElement: { | 42 | didSetElement: { |
| 43 | value: function() { | 43 | value: function() { |
| 44 | NativeInputCheckbox.didSetElement.call(this); | 44 | NativeInputCheckbox.didSetElement.call(this); |
| 45 | this['class'] = (this['class'] || '') + ' montage-inputCheckbox'; | 45 | this['class'] = (this['class'] || '') + ' montage-inputCheckbox'; |
| 46 | } | 46 | } |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | }); | 49 | }); |