aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-12 09:47:52 -0700
committerJose Antonio Marquez2012-06-12 09:47:52 -0700
commit5a46f92f3127f7cc7870f125e8da2b44c2891fd0 (patch)
tree5604e15409ade61bf8b68bf0a5a2401edff1a0ee /js/ninja.reel/ninja.html
parent19c77d87df72a85345e527d790878fc65eca189a (diff)
parent6854a72504f57903bd5de003e377f2aefb02d0da (diff)
downloadninja-5a46f92f3127f7cc7870f125e8da2b44c2891fd0.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into TempPromptUI
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a98fca60..38b956bd 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -246,7 +246,7 @@
246 "element":{"#" : "breadCrumbComponent"} 246 "element":{"#" : "breadCrumbComponent"}
247 }, 247 },
248 "bindings" : { 248 "bindings" : {
249 "container": {"<-": "@owner.currentSelectedContainer"}, 249
250 "currentDocument": {"<-": "@documentList.selectedObjects.0"} 250 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
251 } 251 }
252 }, 252 },
@@ -291,7 +291,6 @@
291 "selectionController": { 291 "selectionController": {
292 "prototype": "js/controllers/selection-controller", 292 "prototype": "js/controllers/selection-controller",
293 "bindings" : { 293 "bindings" : {
294 "selectionContainer": {"<-": "@owner.currentSelectedContainer"},
295 "currentDocument": {"<-": "@documentList.selectedObjects.0"}, 294 "currentDocument": {"<-": "@documentList.selectedObjects.0"},
296 "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"} 295 "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"}
297 } 296 }