diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/combobox.reel/combobox.js | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/combobox.reel/combobox.js')
-rwxr-xr-x | js/components/combobox.reel/combobox.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js index bc433f52..29f49b7b 100755 --- a/js/components/combobox.reel/combobox.js +++ b/js/components/combobox.reel/combobox.js | |||
@@ -20,7 +20,8 @@ exports.Combobox = Montage.create(Component, { | |||
20 | }, | 20 | }, |
21 | 21 | ||
22 | labelField: { | 22 | labelField: { |
23 | value: null | 23 | value: null, |
24 | serializable: true | ||
24 | }, | 25 | }, |
25 | 26 | ||
26 | labelFunction: { | 27 | labelFunction: { |
@@ -28,7 +29,8 @@ exports.Combobox = Montage.create(Component, { | |||
28 | }, | 29 | }, |
29 | 30 | ||
30 | dataField: { | 31 | dataField: { |
31 | value: null | 32 | value: null, |
33 | serializable: true | ||
32 | }, | 34 | }, |
33 | 35 | ||
34 | dataFunction: { | 36 | dataFunction: { |