aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html14
-rwxr-xr-xjs/ninja.reel/ninja.js12
2 files changed, 14 insertions, 12 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 7c3bc2c4..12dbf660 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -186,6 +186,9 @@
186 "properties": { 186 "properties": {
187 "element": {"#": "stageAndScenesContainer"}, 187 "element": {"#": "stageAndScenesContainer"},
188 "appModel": {"@": "appModel"} 188 "appModel": {"@": "appModel"}
189 },
190 "bindings": {
191 "activeDocument": {"<-": "@documentController1.activeDocument"}
189 } 192 }
190 }, 193 },
191 194
@@ -263,11 +266,7 @@
263 "selectionController1": { 266 "selectionController1": {
264 "prototype": "js/controllers/selection-controller", 267 "prototype": "js/controllers/selection-controller",
265 "bindings" : { 268 "bindings" : {
266 "selectionContainer": { 269 "selectionContainer": {"<-": "@owner.currentSelectedContainer"}
267 "boundObject": {"@": "owner"},
268 "boundObjectPropertyPath": "currentSelectedContainer",
269 "oneway": true
270 }
271 } 270 }
272 }, 271 },
273 272
@@ -287,7 +286,10 @@
287 }, 286 },
288 287
289 "stylesController": { 288 "stylesController": {
290 "prototype": "js/controllers/styles-controller" 289 "prototype": "js/controllers/styles-controller",
290 "bindings": {
291 "activeDocument": {"<-": "@documentController1.activeDocument"}
292 }
291 }, 293 },
292 294
293 "presetsController": { 295 "presetsController": {
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 537d7eb0..d97a5413 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -172,9 +172,9 @@ exports.Ninja = Montage.create(Component, {
172 172
173 this.application.ninja = this; 173 this.application.ninja = this;
174 174
175 this.toolsData.selectedTool = this.toolsData.defaultToolsData[0]; 175 this.toolsData.selectedTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex];
176 this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[7].subtools; 176 this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools;
177 this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[7].subtools[1]; 177 this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools[1];
178 this.toolsData.selectedToolInstance = this.toolsList[this.toolsData.selectedTool.action]; 178 this.toolsData.selectedToolInstance = this.toolsList[this.toolsData.selectedTool.action];
179 179
180 this.setupGlobalHelpers(); 180 this.setupGlobalHelpers();
@@ -185,9 +185,9 @@ exports.Ninja = Montage.create(Component, {
185 this.eventManager.addEventListener( "selectSubTool", this, false); 185 this.eventManager.addEventListener( "selectSubTool", this, false);
186 this.eventManager.addEventListener( "onOpenDocument", this, false); 186 this.eventManager.addEventListener( "onOpenDocument", this, false);
187 187
188 this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false); 188 this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false);
189 this.addEventListener("change@appModel.chromePreview", this.executeChromePreview, false); 189 this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false);
190 this.addEventListener("change@appModel.debug", this.toggleDebug, false); 190 this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false);
191 191
192 NJevent("appLoading"); 192 NJevent("appLoading");
193 } 193 }