diff options
author | Ananya Sen | 2012-06-12 12:09:45 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-12 12:09:45 -0700 |
commit | 3389cd085555e188800f337525c0fc8884084c04 (patch) | |
tree | 3899c1c4b8bce4ec3c05fb4b8f6f3824cd82188d /js/ninja.reel/ninja.html | |
parent | 1e7f318e7bbc0c3cd95217fc369ccc30963a5381 (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-3389cd085555e188800f337525c0fc8884084c04.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 662f1a1f..7fa58a00 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 | } |