aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu.reel/menu.html
diff options
context:
space:
mode:
authorKruti Shah2012-06-20 15:12:48 -0700
committerKruti Shah2012-06-20 15:12:48 -0700
commit1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch)
tree26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/components/menu/menu.reel/menu.html
parent1ce4bd7033a413c7697888e5712f278219d6d095 (diff)
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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