diff options
author | Valerio Virgillito | 2012-06-19 22:36:36 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-19 22:36:36 -0700 |
commit | fcb6309915161d16a74a4385b905742f35b7d62d (patch) | |
tree | b226a0c335faaa698a98c93254c3ae53f7ff78cd /js/components/menu/menu-item.reel | |
parent | b170ee5133e9ffdacacdf84274b4a1269804a274 (diff) | |
parent | ddeb291801a49b90062510d4e05f8531216cdff9 (diff) | |
download | ninja-fcb6309915161d16a74a4385b905742f35b7d62d.tar.gz |
Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internal
Conflicts:
js/components/menu/menu-entry.reel/menu-entry.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/menu/menu-item.reel')
-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 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; | |||
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: { |