diff options
| author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
| commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
| tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/ninja.reel/ninja.html | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
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 38b956bd..405f57da 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 | ||