From dd663d8fe9191cc57c9cebe6d425562cb45982c2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 07:25:09 -0700 Subject: Removed unused SubSelect Tool --- js/ninja.reel/ninja.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index cf7c6cf4..1bdd0050 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -152,9 +152,9 @@ exports.Ninja = Montage.create(Component, { this.application.ninja = this; - this.toolsData.selectedTool = this.toolsData.defaultToolsData[0]; - this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[7].subtools; - this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[7].subtools[1]; + this.toolsData.selectedTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex]; + this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools; + this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools[1]; this.toolsData.selectedToolInstance = this.toolsList[this.toolsData.selectedTool.action]; this.setupGlobalHelpers(); -- cgit v1.2.3 From 0ebb822b0535bf1bb100b3f3cb396c8b6d3383f1 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 11:23:12 -0700 Subject: fixing some of the document bindings. Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 52a6daa2..51d74cb2 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -186,6 +186,9 @@ "properties": { "element": {"#": "stageAndScenesContainer"}, "appModel": {"@": "appModel"} + }, + "bindings": { + "activeDocument": {"<-": "@documentController1.activeDocument"} } }, @@ -263,11 +266,7 @@ "selectionController1": { "prototype": "js/controllers/selection-controller", "bindings" : { - "selectionContainer": { - "boundObject": {"@": "owner"}, - "boundObjectPropertyPath": "currentSelectedContainer", - "oneway": true - } + "selectionContainer": {"<-": "@owner.currentSelectedContainer"} } }, @@ -287,7 +286,10 @@ }, "stylesController": { - "prototype": "js/controllers/styles-controller" + "prototype": "js/controllers/styles-controller", + "bindings": { + "activeDocument": {"<-": "@documentController1.activeDocument"} + } }, "presetsController": { -- cgit v1.2.3 From fd54dabad7cbc27a0efb0957155c00d578912909 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 15:32:36 -0700 Subject: changing @change to propertyChangeListener Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 3fcce925..87167d4c 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -165,9 +165,9 @@ exports.Ninja = Montage.create(Component, { this.eventManager.addEventListener( "selectSubTool", this, false); this.eventManager.addEventListener( "onOpenDocument", this, false); - this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false); - this.addEventListener("change@appModel.chromePreview", this.executeChromePreview, false); - this.addEventListener("change@appModel.debug", this.toggleDebug, false); + this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false); + this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false); + this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false); NJevent("appLoading"); } -- cgit v1.2.3