diff options
author | Jonathan Duran | 2012-06-26 08:13:49 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-26 08:13:49 -0700 |
commit | 1bc2fb4441387877bc6b1aef78e4e466f526f60f (patch) | |
tree | eef16b66f6771862efac72aaeaa692c9e322c161 /js/panels | |
parent | 616ade06c8f669d18c27d27c3ee46a9c844a54ca (diff) | |
parent | d2e88bb251efb29f13911942f1f91101715c727e (diff) | |
download | ninja-1bc2fb4441387877bc6b1aef78e4e466f526f60f.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 08434b01..9c31cf45 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -18,7 +18,6 @@ var Hottext = require("js/components/hottextunit.reel").HotTextUnit; | |||
18 | var HT = require("js/components/hottext.reel").HotText; | 18 | var HT = require("js/components/hottext.reel").HotText; |
19 | var Dropdown = require("js/components/combobox.reel").Combobox; | 19 | var Dropdown = require("js/components/combobox.reel").Combobox; |
20 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
21 | var FileInput = require("js/components/ui/file-input.reel").FileInput; | ||
22 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; | 21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; |
23 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; |
24 | var Button = require("montage/ui/button.reel").Button; | 23 | var Button = require("montage/ui/button.reel").Button; |
@@ -322,8 +321,9 @@ exports.CustomSection = Montage.create(Component, { | |||
322 | 321 | ||
323 | //Bind object value to controls list so it can be manipulated | 322 | //Bind object value to controls list so it can be manipulated |
324 | Object.defineBinding(this.controls, aField.id, { | 323 | Object.defineBinding(this.controls, aField.id, { |
325 | boundObject: obj, | 324 | boundObject: obj, |
326 | boundObjectPropertyPath: "value" | 325 | boundObjectPropertyPath: "value", |
326 | oneway: false | ||
327 | }); | 327 | }); |
328 | 328 | ||
329 | return obj; | 329 | return obj; |