aboutsummaryrefslogtreecommitdiff
path: root/js/components/combobox.reel/combobox.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /js/components/combobox.reel/combobox.js
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/components/combobox.reel/combobox.js')
-rwxr-xr-xjs/components/combobox.reel/combobox.js6
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: {