diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/ninja.reel/ninja.html | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 7fa58a00..2a271d7e 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -163,7 +163,7 @@ | |||
163 | "element": {"#": "stageMode"} | 163 | "element": {"#": "stageMode"} |
164 | }, | 164 | }, |
165 | "bindings" : { | 165 | "bindings" : { |
166 | "livePreview": {"<<->": "@appModel.livePreview"} | 166 | "livePreview": {"<->": "@appModel.livePreview"} |
167 | } | 167 | } |
168 | }, | 168 | }, |
169 | 169 | ||
@@ -291,8 +291,7 @@ | |||
291 | "selectionController": { | 291 | "selectionController": { |
292 | "prototype": "js/controllers/selection-controller", | 292 | "prototype": "js/controllers/selection-controller", |
293 | "bindings" : { | 293 | "bindings" : { |
294 | "currentDocument": {"<-": "@documentList.selectedObjects.0"}, | 294 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} |
295 | "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"} | ||
296 | } | 295 | } |
297 | }, | 296 | }, |
298 | 297 | ||
@@ -309,7 +308,7 @@ | |||
309 | "selectObjectsOnAddition": true | 308 | "selectObjectsOnAddition": true |
310 | }, | 309 | }, |
311 | "bindings": { | 310 | "bindings": { |
312 | "content": {"<<->": "@documentController.documents"} | 311 | "content": {"<->": "@documentController.documents"} |
313 | } | 312 | } |
314 | }, | 313 | }, |
315 | 314 | ||