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/ui/property-control.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/ui/property-control.reel')
| -rwxr-xr-x | js/components/ui/property-control.reel/property-control.html | 2 | ||||
| -rwxr-xr-x | js/components/ui/property-control.reel/property-control.js | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html index 549925b5..bd0b49b7 100755 --- a/js/components/ui/property-control.reel/property-control.html +++ b/js/components/ui/property-control.reel/property-control.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/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 2f91491f..49ee7334 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js | |||
| @@ -170,15 +170,15 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { | |||
| 170 | }, | 170 | }, |
| 171 | 171 | ||
| 172 | handleEvent: | 172 | handleEvent: |
| 173 | { | 173 | { |
| 174 | value:function(event) | 174 | value:function(event) |
| 175 | { | 175 | { |
| 176 | if(event.wasSetByCode) { | 176 | if(event.wasSetByCode) { |
| 177 | return; | 177 | return; |
| 178 | } | 178 | } |
| 179 | this._dispatchPropEvent(event); | 179 | this._dispatchPropEvent(event); |
| 180 | } | 180 | } |
| 181 | }, | 181 | }, |
| 182 | 182 | ||
| 183 | _dispatchPropEvent: { | 183 | _dispatchPropEvent: { |
| 184 | value: function(event) { | 184 | value: function(event) { |
| @@ -196,7 +196,7 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { | |||
| 196 | propEvent.propertyLabel = this.label; | 196 | propEvent.propertyLabel = this.label; |
| 197 | propEvent.propertyValue = event.currentTarget[this._prop]; | 197 | propEvent.propertyValue = event.currentTarget[this._prop]; |
| 198 | propEvent.propertyEvent = event; | 198 | propEvent.propertyEvent = event; |
| 199 | 199 | ||
| 200 | this.dispatchEvent(propEvent); | 200 | this.dispatchEvent(propEvent); |
| 201 | } | 201 | } |
| 202 | }, | 202 | }, |