diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/ninja.reel/ninja.html | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 11f7c53e..0a959812 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 | ||