aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu.reel/menu.html
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 09:54:57 -0700
committerJonathan Duran2012-06-20 09:54:57 -0700
commit2713506b753bc39fec8bca8c027d21c45dc2e489 (patch)
treeeb6c0621cadbf0a87d8a97613ab11a231e377a8e /js/components/menu/menu.reel/menu.html
parent2c60886f68e955195e7e024e0787965e972f0d81 (diff)
parentfcb6309915161d16a74a4385b905742f35b7d62d (diff)
downloadninja-2713506b753bc39fec8bca8c027d21c45dc2e489.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/components/menu/menu.reel/menu.html')
-rwxr-xr-xjs/components/menu/menu.reel/menu.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index f18c1a0f..98ffa92c 100755
--- a/js/components/menu/menu.reel/menu.html
+++ b/js/components/menu/menu.reel/menu.html
@@ -44,7 +44,8 @@
44 "element": { "#": "menuItem" } 44 "element": { "#": "menuItem" }
45 }, 45 },
46 "bindings": { 46 "bindings": {
47 "data": {"<-": "@repetition.objectAtCurrentIteration"} 47 "data": {"<-": "@repetition.objectAtCurrentIteration"},
48 "menuIsActive": {"<-": "@owner.active"}
48 } 49 }
49 }, 50 },
50 51