aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-entry.reel/menu-entry.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/menu/menu-entry.reel/menu-entry.html
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
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