aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-19 10:25:16 -0700
committerJose Antonio Marquez2012-06-19 10:25:16 -0700
commit4d2a5acd1631f0cf4e38f127c886f481668ddce0 (patch)
tree3bc8f2b21826c0ee6d37bc77753d45a882783cbf /js/panels/properties.reel
parent616b31a644ee221edcbc19f821b2194e8edf9fad (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-4d2a5acd1631f0cf4e38f127c886f481668ddce0.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.js4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js6
2 files changed, 7 insertions, 3 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 43c92b74..fcd0ab01 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -367,7 +367,7 @@ exports.Properties = Montage.create(Component, {
367 } 367 }
368 } else { 368 } else {
369 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'}; 369 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
370 this.application.ninja.colorController.colorModel.applyNoColor(); 370 this.application.ninja.colorController.colorModel.applyNoColor(true);
371 } 371 }
372 } 372 }
373 } 373 }
@@ -397,7 +397,7 @@ exports.Properties = Montage.create(Component, {
397 this.application.ninja.colorController.colorModel.hsv = color.c; 397 this.application.ninja.colorController.colorModel.hsv = color.c;
398 break; 398 break;
399 default: 399 default:
400 this.application.ninja.colorController.colorModel.applyNoColor(); 400 this.application.ninja.colorController.colorModel.applyNoColor(true);
401 break; 401 break;
402 } 402 }
403 } 403 }
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index c599dcb0..08434b01 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -116,7 +116,11 @@ exports.CustomSection = Montage.create(Component, {
116 value: function(event) { 116 value: function(event) {
117 // Change the stage color for now 117 // Change the stage color for now
118 //console.log(this, event); 118 //console.log(this, event);
119 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); 119 if (event._event.color && event._event.color.css) {
120 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", '');
121 } else {
122 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", '');
123 }
120 /* 124 /*
121 var propEvent = document.createEvent("CustomEvent"); 125 var propEvent = document.createEvent("CustomEvent");
122 propEvent.initEvent("propertyChange", true, true); 126 propEvent.initEvent("propertyChange", true, true);