diff options
author | Ananya Sen | 2012-06-20 10:40:52 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-20 10:40:52 -0700 |
commit | 7ebdf28143306c0e3eca08846114179f0e037c1e (patch) | |
tree | 5cb3529278417fe64705fa71e840046c543575b5 /js/components/menu/menu-item.reel/menu-item.js | |
parent | 50ee24fdfade83778f623a2e45effca953931a30 (diff) | |
parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
download | ninja-7ebdf28143306c0e3eca08846114179f0e037c1e.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/components/menu/menu-entry.reel/menu-entry.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/menu/menu-item.reel/menu-item.js')
-rwxr-xr-x | js/components/menu/menu-item.reel/menu-item.js | 9 |
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 5ff6b024..fff8565b 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; | |||
10 | exports.MenuItem = Montage.create(Component, { | 10 | exports.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: { |