aboutsummaryrefslogtreecommitdiff
path: root/js/components/combobox.reel/combobox.js
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/combobox.reel/combobox.js
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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: {