aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/layout/tools-list.reel')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html10
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js4
2 files changed, 0 insertions, 14 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index acee20b2..f559e748 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -85,9 +85,6 @@
85 "LineTool1": { 85 "LineTool1": {
86 "prototype": "js/tools/LineTool" 86 "prototype": "js/tools/LineTool"
87 }, 87 },
88 "PencilTool1": {
89 "prototype": "js/tools/PencilTool"
90 },
91 "BrushTool1": { 88 "BrushTool1": {
92 "prototype": "js/tools/BrushTool" 89 "prototype": "js/tools/BrushTool"
93 }, 90 },
@@ -97,9 +94,6 @@
97 "InkBottleTool1": { 94 "InkBottleTool1": {
98 "prototype": "js/tools/InkBottleTool" 95 "prototype": "js/tools/InkBottleTool"
99 }, 96 },
100 "EyedropperTool1": {
101 "prototype": "js/tools/EyedropperTool"
102 },
103 "EraserTool1": { 97 "EraserTool1": {
104 "prototype": "js/tools/EraserTool" 98 "prototype": "js/tools/EraserTool"
105 }, 99 },
@@ -142,11 +136,9 @@
142 "OvalTool": {"@": "OvalTool1"}, 136 "OvalTool": {"@": "OvalTool1"},
143 "RectTool": {"@": "RectTool1"}, 137 "RectTool": {"@": "RectTool1"},
144 "LineTool": {"@": "LineTool1"}, 138 "LineTool": {"@": "LineTool1"},
145 "PencilTool": {"@": "PencilTool1"},
146 "BrushTool": {"@": "BrushTool1"}, 139 "BrushTool": {"@": "BrushTool1"},
147 "FillTool": {"@": "FillTool1"}, 140 "FillTool": {"@": "FillTool1"},
148 "InkBottleTool": {"@": "InkBottleTool1"}, 141 "InkBottleTool": {"@": "InkBottleTool1"},
149 "EyedropperTool": {"@": "EyedropperTool1"},
150 "EraserTool": {"@": "EraserTool1"}, 142 "EraserTool": {"@": "EraserTool1"},
151 "RotateStageTool3D": {"@": "RotateStageTool3D1"}, 143 "RotateStageTool3D": {"@": "RotateStageTool3D1"},
152 "PanTool": {"@": "PanTool1"}, 144 "PanTool": {"@": "PanTool1"},
@@ -169,8 +161,6 @@
169 <hr /> 161 <hr />
170 </div> 162 </div>
171 </div> 163 </div>
172 <!-- TODO: Remove and add as a component -->
173 <div id="colortoolbar"></div>
174 <div id="disabledCondition" class="panelDisabled"></div> 164 <div id="disabledCondition" class="panelDisabled"></div>
175 </div> 165 </div>
176 166
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index d68e8a56..ed4ee45f 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -20,11 +20,9 @@ exports.ToolsList = Montage.create(Component, {
20 OvalTool: { value: null }, 20 OvalTool: { value: null },
21 RectTool: { value: null }, 21 RectTool: { value: null },
22 LineTool: { value: null }, 22 LineTool: { value: null },
23 PencilTool: { value: null },
24 BrushTool: { value: null }, 23 BrushTool: { value: null },
25 FillTool: { value: null }, 24 FillTool: { value: null },
26 InkBottleTool: { value: null }, 25 InkBottleTool: { value: null },
27 EyedropperTool: { value: null },
28 EraserTool: { value: null }, 26 EraserTool: { value: null },
29 RotateStageTool3D: { value: null }, 27 RotateStageTool3D: { value: null },
30 PanTool: { value: null }, 28 PanTool: { value: null },
@@ -68,10 +66,8 @@ exports.ToolsList = Montage.create(Component, {
68 this.OvalTool.options = this.application.ninja.toolsProperties.shapeProperties.ovalProperties; 66 this.OvalTool.options = this.application.ninja.toolsProperties.shapeProperties.ovalProperties;
69 this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties; 67 this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties;
70 this.LineTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties; 68 this.LineTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;
71 this.PencilTool.options = this.application.ninja.toolsProperties.pencilProperties;
72 this.BrushTool.options = this.application.ninja.toolsProperties.brushProperties; 69 this.BrushTool.options = this.application.ninja.toolsProperties.brushProperties;
73 70
74 this.EyedropperTool.options = this.application.ninja.toolsProperties.eyedropperProperties;
75 this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties; 71 this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties;
76 this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties; 72 this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties;
77 this.PanTool.options = this.application.ninja.toolsProperties.panProperties; 73 this.PanTool.options = this.application.ninja.toolsProperties.panProperties;