aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/ninja.reel/ninja.html
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html7
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