aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu.reel
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.reel
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.reel')
-rwxr-xr-xjs/components/menu/menu.reel/menu.html14
1 files changed, 6 insertions, 8 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index f15cf119..f18c1a0f 100755
--- a/js/components/menu/menu.reel/menu.html
+++ b/js/components/menu/menu.reel/menu.html
@@ -31,9 +31,10 @@
31 "repetition": { 31 "repetition": {
32 "prototype": "montage/ui/repetition.reel", 32 "prototype": "montage/ui/repetition.reel",
33 "properties": { 33 "properties": {
34 "element": { "#": "topMenu" }, 34 "element": { "#": "topMenu" }
35 "contentController": {"@": "menuController"}, 35 },
36 "menuComponent": {"@": "owner"} 36 "bindings": {
37 "objects": {"<-": "@menudata.topLevelMenu"}
37 } 38 }
38 }, 39 },
39 40
@@ -43,17 +44,14 @@
43 "element": { "#": "menuItem" } 44 "element": { "#": "menuItem" }
44 }, 45 },
45 "bindings": { 46 "bindings": {
46 "data": {"<-": "@repetition.objectAtCurrentIteration"}, 47 "data": {"<-": "@repetition.objectAtCurrentIteration"}
47 "_menu": {"<-": "@repetition.menuComponent"}
48 } 48 }
49 }, 49 },
50 50
51 "owner": { 51 "owner": {
52 "prototype": "js/components/menu/menu.reel", 52 "prototype": "js/components/menu/menu.reel",
53 "properties": { 53 "properties": {
54 "element": {"#": "mainMenuBar"}, 54 "element": {"#": "mainMenuBar"}
55 "controller": {"@": "menuController"},
56 "rep": {"@": "repetition"}
57 } 55 }
58 } 56 }
59 } 57 }