diff options
author | Jonathan Duran | 2012-06-20 09:54:57 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-20 09:54:57 -0700 |
commit | 2713506b753bc39fec8bca8c027d21c45dc2e489 (patch) | |
tree | eb6c0621cadbf0a87d8a97613ab11a231e377a8e /js/components/menu/menu.reel/menu.html | |
parent | 2c60886f68e955195e7e024e0787965e972f0d81 (diff) | |
parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
download | ninja-2713506b753bc39fec8bca8c027d21c45dc2e489.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/components/menu/menu.reel/menu.html')
-rwxr-xr-x | js/components/menu/menu.reel/menu.html | 3 |
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 | ||