aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 00:45:26 -0700
committerArmen Kesablyan2012-06-19 00:45:26 -0700
commitc59eb371559a3061ce53223e249ca97daace5968 (patch)
treef9540e26c0f273d35f92010605da65dd85bbe70c /js/panels/properties.reel/sections/custom.reel
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js12
1 files changed, 11 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 9df16112..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);
@@ -233,6 +237,12 @@ exports.CustomSection = Montage.create(Component, {
233 boundObjectPropertyPath: "value" 237 boundObjectPropertyPath: "value"
234 }); 238 });
235 239
240 //Bind object value to controls list so it can be manipulated
241 Object.defineBinding(this.controls, aField.id + "Units", {
242 boundObject: obj,
243 boundObjectPropertyPath: "units"
244 });
245
236 return obj; 246 return obj;
237 } 247 }
238 }, 248 },