aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-18 22:22:57 -0700
committerValerio Virgillito2012-06-18 22:22:57 -0700
commit795a6908ccac21b773490954371f2c4def9e5379 (patch)
tree68db12b1fc96286cc8ff78034c7b155df71f9ef3 /js/panels/properties.reel/sections/custom.reel
parentad6f78493295c9c7b4c11cd6a895dd5cc8e207f7 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-795a6908ccac21b773490954371f2c4def9e5379.tar.gz
Merge branch 'refs/heads/master' into montage-v11-integration
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js6
1 files changed, 5 insertions, 1 deletions
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);