aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/list.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/ui/list.reel
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/list.reel')
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/list.reel/list.html b/node_modules/montage/ui/list.reel/list.html
index d3b27e0a..25027bcb 100755
--- a/node_modules/montage/ui/list.reel/list.html
+++ b/node_modules/montage/ui/list.reel/list.html
@@ -17,7 +17,7 @@
17 } 17 }
18 }, 18 },
19 "bindings": { 19 "bindings": {
20 "content": {"<-": "@owner.originalContent"}, 20 "domContent": {"<-": "@owner.originalContent"},
21 "objects": {"<-": "@owner.objects"}, 21 "objects": {"<-": "@owner.objects"},
22 "contentController": {"<-": "@owner.contentController"}, 22 "contentController": {"<-": "@owner.contentController"},
23 "isSelectionEnabled": {"<-": "@owner.isSelectionEnabled"} 23 "isSelectionEnabled": {"<-": "@owner.isSelectionEnabled"}