aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-item.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 09:55:14 -0700
committerJonathan Duran2012-06-20 09:55:14 -0700
commitf887a74a7d03a2008a2c43d455a2b3e9223028af (patch)
treeeb6c0621cadbf0a87d8a97613ab11a231e377a8e /js/components/menu/menu-item.reel
parent2c60886f68e955195e7e024e0787965e972f0d81 (diff)
parentfcb6309915161d16a74a4385b905742f35b7d62d (diff)
downloadninja-f887a74a7d03a2008a2c43d455a2b3e9223028af.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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: {