diff options
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel')
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.html | 2 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html index 04777198..5b406a92 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.html +++ b/js/panels/properties.reel/sections/custom.reel/custom.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/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 0616da59..411de2f6 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -117,20 +117,20 @@ exports.CustomSection = Montage.create(Component, { | |||
117 | }, | 117 | }, |
118 | 118 | ||
119 | handleChanging: { | 119 | handleChanging: { |
120 | value:function(event) { | 120 | value:function(event) { |
121 | var obj = event.currentTarget; | 121 | var obj = event.currentTarget; |
122 | this._dispatchPropEvent({"type": "changing", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); | 122 | this._dispatchPropEvent({"type": "changing", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); |
123 | } | 123 | } |
124 | }, | 124 | }, |
125 | 125 | ||
126 | handleChange: { | 126 | handleChange: { |
127 | value:function(event) { | 127 | value:function(event) { |
128 | if(event._event.wasSetByCode) return; | 128 | if(event._event.wasSetByCode) return; |
129 | 129 | ||
130 | var obj = event.currentTarget; | 130 | var obj = event.currentTarget; |
131 | this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); | 131 | this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); |
132 | } | 132 | } |
133 | }, | 133 | }, |
134 | 134 | ||
135 | /** | 135 | /** |
136 | * Color change handler. Hard coding the stage for now since only the stage PI uses this color chip | 136 | * Color change handler. Hard coding the stage for now since only the stage PI uses this color chip |
@@ -139,23 +139,23 @@ exports.CustomSection = Montage.create(Component, { | |||
139 | value: function(event) { | 139 | value: function(event) { |
140 | // Change the stage color for now | 140 | // Change the stage color for now |
141 | //console.log(this, event); | 141 | //console.log(this, event); |
142 | 142 | ||
143 | if (event._event.colorMode !== 'gradient' && event._event.color) { | 143 | if (event._event.colorMode !== 'gradient' && event._event.color) { |
144 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', [event._event.color.css], "Change", "pi", ''); | 144 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', [event._event.color.css], "Change", "pi", ''); |
145 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); | 145 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); |
146 | } else if (event._event.color) { | 146 | } else if (event._event.color) { |
147 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', [event._event.color.css], "Change", "pi", ''); | 147 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', [event._event.color.css], "Change", "pi", ''); |
148 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); | 148 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); |
149 | } else { | 149 | } else { |
150 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); | 150 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); |
151 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); | 151 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); |
152 | } | 152 | } |
153 | 153 | ||
154 | /* | 154 | /* |
155 | if (event._event.color && event._event.color.css) { | 155 | if (event._event.color && event._event.color.css) { |
156 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); | 156 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); |
157 | } else { | 157 | } else { |
158 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", ''); | 158 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", ''); |
159 | } | 159 | } |
160 | */ | 160 | */ |
161 | /* | 161 | /* |