aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 17:16:21 -0700
committerPushkar Joshi2012-05-31 17:16:21 -0700
commit8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch)
tree19a8af74c58c9ea261f0842f36efdab959be3256 /js/panels/properties.reel/sections/custom.reel
parenteea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff)
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
downloadninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js20
1 files changed, 10 insertions, 10 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 876fe110..ae408f11 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -19,7 +19,7 @@ var HT = require("js/components/hottext.reel").HotText;
19var Dropdown = require("js/components/combobox.reel").Combobox; 19var Dropdown = require("js/components/combobox.reel").Combobox;
20var TextField = require("js/components/textfield.reel").TextField; 20var TextField = require("js/components/textfield.reel").TextField;
21var FileInput = require("js/components/ui/file-input.reel").FileInput; 21var FileInput = require("js/components/ui/file-input.reel").FileInput;
22var Checkbox = require("js/components/checkbox.reel").Checkbox; 22var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox;
23var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; 23var ColorChip = require("js/components/ui/color-chip.reel").ColorChip;
24var Button = require("montage/ui/button.reel").Button; 24var Button = require("montage/ui/button.reel").Button;
25 25
@@ -77,7 +77,7 @@ exports.CustomSection = Montage.create(Component, {
77 this.rows.push(tmpRow); 77 this.rows.push(tmpRow);
78 78
79 } else if(this._fields[i].length === 3) { 79 } else if(this._fields[i].length === 3) {
80 80
81 } 81 }
82 82
83 } 83 }
@@ -103,7 +103,7 @@ exports.CustomSection = Montage.create(Component, {
103 handleChange: { 103 handleChange: {
104 value:function(event) { 104 value:function(event) {
105 if(event._event.wasSetByCode) return; 105 if(event._event.wasSetByCode) return;
106 106
107 var obj = event.currentTarget; 107 var obj = event.currentTarget;
108 this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); 108 this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj});
109 } 109 }
@@ -116,7 +116,7 @@ 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.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); 119 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", '');
120 /* 120 /*
121 var propEvent = document.createEvent("CustomEvent"); 121 var propEvent = document.createEvent("CustomEvent");
122 propEvent.initEvent("propertyChange", true, true); 122 propEvent.initEvent("propertyChange", true, true);
@@ -262,10 +262,10 @@ exports.CustomSection = Montage.create(Component, {
262 if(aField.enabled.boundObject) { 262 if(aField.enabled.boundObject) {
263 // TODO - For now, always bind to this.controls[someProperty] 263 // TODO - For now, always bind to this.controls[someProperty]
264 Object.defineBinding(obj, "enabled", { 264 Object.defineBinding(obj, "enabled", {
265 boundObject: this.controls, 265 boundObject: this.controls,
266 boundObjectPropertyPath: aField.enabled.boundProperty, 266 boundObjectPropertyPath: aField.enabled.boundProperty,
267 oneway: false 267 oneway: false
268 }); 268 });
269 } else { 269 } else {
270 obj.enabled = aField.enabled; 270 obj.enabled = aField.enabled;
271 } 271 }
@@ -349,7 +349,7 @@ exports.CustomSection = Montage.create(Component, {
349 value: function(aField) { 349 value: function(aField) {
350 350
351 // Generate Textfield 351 // Generate Textfield
352 var obj = Checkbox.create(); 352 var obj = LabelCheckbox.create();
353 353
354 // Set Values for TextField 354 // Set Values for TextField
355 if (aField.id) obj.id = aField.id; 355 if (aField.id) obj.id = aField.id;
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, {
400 this.controls[aField.id] = obj; 400 this.controls[aField.id] = obj;
401 401
402 // TODO - Hack for now to reference the color select object to unregister color chips 402 // TODO - Hack for now to reference the color select object to unregister color chips
403 this.controls["stageBackground"] = obj; 403 this.controls["background"] = obj;
404 404
405 return obj; 405 return obj;
406 } 406 }