aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom.reel/custom.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e /js/panels/properties.reel/sections/custom.reel/custom.js
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel/custom.js')
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js16
1 files changed, 8 insertions, 8 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..49b4414e 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 }
@@ -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;