diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/ninja.reel/ninja.html | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a98fca60..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 | ||
| @@ -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,9 +291,7 @@ | |||
| 291 | "selectionController": { | 291 | "selectionController": { |
| 292 | "prototype": "js/controllers/selection-controller", | 292 | "prototype": "js/controllers/selection-controller", |
| 293 | "bindings" : { | 293 | "bindings" : { |
| 294 | "selectionContainer": {"<-": "@owner.currentSelectedContainer"}, | 294 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} |
| 295 | "currentDocument": {"<-": "@documentList.selectedObjects.0"}, | ||
| 296 | "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"} | ||
| 297 | } | 295 | } |
| 298 | }, | 296 | }, |
| 299 | 297 | ||
| @@ -310,7 +308,7 @@ | |||
| 310 | "selectObjectsOnAddition": true | 308 | "selectObjectsOnAddition": true |
| 311 | }, | 309 | }, |
| 312 | "bindings": { | 310 | "bindings": { |
| 313 | "content": {"<<->": "@documentController.documents"} | 311 | "content": {"<->": "@documentController.documents"} |
| 314 | } | 312 | } |
| 315 | }, | 313 | }, |
| 316 | 314 | ||