aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /js/components/menu/menu.reel
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
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 }