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 /js/components/radio.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 'js/components/radio.reel')
| -rwxr-xr-x | js/components/radio.reel/radio.html | 2 | ||||
| -rwxr-xr-x | js/components/radio.reel/radio.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/js/components/radio.reel/radio.html b/js/components/radio.reel/radio.html index 8e0577de..d323801a 100755 --- a/js/components/radio.reel/radio.html +++ b/js/components/radio.reel/radio.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/radio.reel/radio.js b/js/components/radio.reel/radio.js index 08131272..29b1b635 100755 --- a/js/components/radio.reel/radio.js +++ b/js/components/radio.reel/radio.js | |||
| @@ -176,11 +176,11 @@ exports.Radio = Montage.create(Component, { | |||
| 176 | handleChange: | 176 | handleChange: |
| 177 | { | 177 | { |
| 178 | value:function(event) | 178 | value:function(event) |
| 179 | { | 179 | { |
| 180 | this._valueSyncedWithInputField = true; | 180 | this._valueSyncedWithInputField = true; |
| 181 | this._wasSetByCode = false; | 181 | this._wasSetByCode = false; |
| 182 | this.checked = this.radioField.checked; | 182 | this.checked = this.radioField.checked; |
| 183 | } | 183 | } |
| 184 | }, | 184 | }, |
| 185 | handleClick: { | 185 | handleClick: { |
| 186 | value: function() { | 186 | value: function() { |
| @@ -188,7 +188,7 @@ exports.Radio = Montage.create(Component, { | |||
| 188 | this.checked = !this.radioField.checked; | 188 | this.checked = !this.radioField.checked; |
| 189 | } | 189 | } |
| 190 | }, | 190 | }, |
| 191 | 191 | ||
| 192 | draw: { | 192 | draw: { |
| 193 | value: function() { | 193 | value: function() { |
| 194 | if(!this._valueSyncedWithInputField) | 194 | if(!this._valueSyncedWithInputField) |