aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-entry.reel/menu-entry.html
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/menu/menu-entry.reel/menu-entry.html
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/components/menu/menu-entry.reel/menu-entry.html')
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html
index f64de3cb..7310545f 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.html
+++ b/js/components/menu/menu-entry.reel/menu-entry.html
@@ -24,8 +24,10 @@
24 "repetition": { 24 "repetition": {
25 "prototype": "montage/ui/repetition.reel", 25 "prototype": "montage/ui/repetition.reel",
26 "properties": { 26 "properties": {
27 "element": { "#": "subEntries" }, 27 "element": { "#": "subEntries" }
28 "contentController": {"@": "entriesController"} 28 },
29 "bindings": {
30 "objects": {"<-": "@owner.data.entries"}
29 } 31 }
30 }, 32 },
31 33