aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-item.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 11:30:26 -0700
committerJose Antonio Marquez2012-06-20 11:30:26 -0700
commitfe569a08853fe986849b6496384d01f3abb65e40 (patch)
tree2c3a64f0b51f32df0e4cf4d23ca34740b89598ba /js/components/menu/menu-item.reel
parent7ca20cc617fb1f9d6d692b27e8bbb74f69693dcd (diff)
parent4fb904eb5660cac28e2085d4aedce8fa249339b5 (diff)
downloadninja-fe569a08853fe986849b6496384d01f3abb65e40.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/components/menu/menu-item.reel')
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js9
1 files changed, 3 insertions, 6 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index f9a625a3..3a5bf4ab 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -10,18 +10,15 @@ var Component = require("montage/ui/component").Component;
10exports.MenuItem = Montage.create(Component, { 10exports.MenuItem = Montage.create(Component, {
11 11
12 itemBackground: { 12 itemBackground: {
13 value: null, 13 value: null
14 serializable: true
15 }, 14 },
16 15
17 itemText: { 16 itemText: {
18 value: null, 17 value: null
19 serializable: true
20 }, 18 },
21 19
22 subMenu: { 20 subMenu: {
23 value: null, 21 value: null
24 serializable: true
25 }, 22 },
26 23
27 data: { 24 data: {