aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 15:40:06 -0700
committerValerio Virgillito2012-05-16 15:40:06 -0700
commitc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (patch)
tree01be4d0fe4c96de8270411a32bb76378769d5b2d /js/ninja.reel
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
parent26c4d00b3e5d39c1c313d48433abebd06f386a85 (diff)
downloadninja-c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac.tar.gz
Merge pull request #239 from mayhewinator/WorkingBranch
Tool Options styling and Icon update
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.js6
1 files changed, 3 insertions, 3 deletions
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, {
152 152
153 this.application.ninja = this; 153 this.application.ninja = this;
154 154
155 this.toolsData.selectedTool = this.toolsData.defaultToolsData[0]; 155 this.toolsData.selectedTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex];
156 this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[7].subtools; 156 this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools;
157 this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[7].subtools[1]; 157 this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools[1];
158 this.toolsData.selectedToolInstance = this.toolsList[this.toolsData.selectedTool.action]; 158 this.toolsData.selectedToolInstance = this.toolsList[this.toolsData.selectedTool.action];
159 159
160 this.setupGlobalHelpers(); 160 this.setupGlobalHelpers();