aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-item.reel/menu-item.js
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/menu/menu-item.reel/menu-item.js
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/menu/menu-item.reel/menu-item.js')
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index c00c4412..f9a625a3 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -9,6 +9,21 @@ var Component = require("montage/ui/component").Component;
9 9
10exports.MenuItem = Montage.create(Component, { 10exports.MenuItem = Montage.create(Component, {
11 11
12 itemBackground: {
13 value: null,
14 serializable: true
15 },
16
17 itemText: {
18 value: null,
19 serializable: true
20 },
21
22 subMenu: {
23 value: null,
24 serializable: true
25 },
26
12 data: { 27 data: {
13 value: null 28 value: null
14 }, 29 },