aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties/content.reel/content.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-29 12:09:43 -0800
committerValerio Virgillito2012-02-29 12:09:43 -0800
commit3d233f25cff057fff5c5a75e4c4b40e88c22a8f5 (patch)
tree1ee8d228700cd37632f2213b260142b13aa69c70 /js/panels/properties/content.reel/content.js
parent3dbe798285f95dc63ae33739df5daadb8c432f24 (diff)
parent209e0781e926212bbaaad9e8ca4b61a0c389b30f (diff)
downloadninja-3d233f25cff057fff5c5a75e4c4b40e88c22a8f5.tar.gz
Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into integration-candidate
Diffstat (limited to 'js/panels/properties/content.reel/content.js')
-rwxr-xr-xjs/panels/properties/content.reel/content.js22
1 files changed, 22 insertions, 0 deletions
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index cc9ec96a..72c02ffd 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -172,6 +172,17 @@ exports.Content = Montage.create(Component, {
172 this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(stage, "width")); 172 this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(stage, "width"));
173 173
174 if(this.customPi !== stage.elementModel.pi) { 174 if(this.customPi !== stage.elementModel.pi) {
175 // We need to unregister color chips from the previous selection from the Color Model
176 var len = this.customSections.length;
177 for(var n = 0, controls; n < len; n++) {
178 controls = this.customSections[n].content.controls;
179 if(controls["colorSelect"]) {
180 controls["colorSelect"].destroy();
181 } else if(controls["stageBackground"]) {
182 controls["stageBackground"].destroy();
183 }
184 }
185
175 this.customPi = stage.elementModel.pi; 186 this.customPi = stage.elementModel.pi;
176 this.displayCustomProperties(stage, stage.elementModel.pi); 187 this.displayCustomProperties(stage, stage.elementModel.pi);
177 } 188 }
@@ -237,6 +248,17 @@ exports.Content = Montage.create(Component, {
237 248
238 // Custom Section 249 // Custom Section
239 if(this.customPi !== el.elementModel.pi) { 250 if(this.customPi !== el.elementModel.pi) {
251 // We need to unregister color chips from the previous selection from the Color Model
252 var len = this.customSections.length;
253 for(var n = 0, controls; n < len; n++) {
254 controls = this.customSections[n].content.controls;
255 if(controls["colorSelect"]) {
256 controls["colorSelect"].destroy();
257 } else if(controls["stageBackground"]) {
258 controls["stageBackground"].destroy();
259 }
260 }
261
240 this.customPi = el.elementModel.pi; 262 this.customPi = el.elementModel.pi;
241 this.displayCustomProperties(el, el.elementModel.pi); 263 this.displayCustomProperties(el, el.elementModel.pi);
242 } 264 }