aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 14:30:47 -0700
committerJohn Mayhew2012-05-07 14:30:47 -0700
commit29ad6355ef60cfb3b3fc7f780504f3ed30845883 (patch)
treebbe2dcd46c98db8138ad0a8f0263ef33324d7669 /js/components
parent1a759361b82127f9d5c1428dc889fffdf2daaf86 (diff)
downloadninja-29ad6355ef60cfb3b3fc7f780504f3ed30845883.tar.gz
More implementation of moving color chips to the individual subtools.
Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html10
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js4
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html16
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css22
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html29
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js48
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.css8
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html5
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.css6
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html31
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.js25
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css7
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html8
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.css16
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html10
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js47
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.css10
18 files changed, 172 insertions, 132 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;
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 8dd0f713..c51ab27d 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -66,12 +66,6 @@
66 } 66 }
67 } 67 }
68 }, 68 },
69 "pencilProperties1": {
70 "prototype": "js/components/tools-properties/pencil-properties.reel",
71 "properties": {
72 "element": {"#": "pencilProperties"}
73 }
74 },
75 "brushProperties1": { 69 "brushProperties1": {
76 "prototype": "js/components/tools-properties/brush-properties.reel", 70 "prototype": "js/components/tools-properties/brush-properties.reel",
77 "properties": { 71 "properties": {
@@ -90,12 +84,6 @@
90 "element": {"#": "inkbottleProperties"} 84 "element": {"#": "inkbottleProperties"}
91 } 85 }
92 }, 86 },
93 "eyedropperProperties1": {
94 "prototype": "js/components/tools-properties/eyedropper-properties.reel",
95 "properties": {
96 "element": {"#": "eyedropperProperties"}
97 }
98 },
99 "eraserProperties1": { 87 "eraserProperties1": {
100 "prototype": "js/components/tools-properties/eraser-properties.reel", 88 "prototype": "js/components/tools-properties/eraser-properties.reel",
101 "properties": { 89 "properties": {
@@ -147,11 +135,9 @@
147 "penProperties": {"@": "penProperties1"}, 135 "penProperties": {"@": "penProperties1"},
148 "textProperties": {"@": "textProperties1"}, 136 "textProperties": {"@": "textProperties1"},
149 "shapeProperties": {"@": "shapeProperties1"}, 137 "shapeProperties": {"@": "shapeProperties1"},
150 "pencilProperties": {"@": "pencilProperties1"},
151 "brushProperties": {"@": "brushProperties1"}, 138 "brushProperties": {"@": "brushProperties1"},
152 "fillProperties": {"@": "fillProperties1"}, 139 "fillProperties": {"@": "fillProperties1"},
153 "inkbottleProperties": {"@": "inkbottleProperties1"}, 140 "inkbottleProperties": {"@": "inkbottleProperties1"},
154 "eyedropperProperties": {"@": "eyedropperProperties1"},
155 "eraserProperties": {"@": "eraserProperties1"}, 141 "eraserProperties": {"@": "eraserProperties1"},
156 "rotateStageProperties": {"@": "rotateStageProperties1"}, 142 "rotateStageProperties": {"@": "rotateStageProperties1"},
157 "panProperties": {"@": "panProperties1"}, 143 "panProperties": {"@": "panProperties1"},
@@ -179,11 +165,9 @@
179 <div id="penProperties"></div> 165 <div id="penProperties"></div>
180 <div id="textProperties"></div> 166 <div id="textProperties"></div>
181 <div id="shapeProperties"></div> 167 <div id="shapeProperties"></div>
182 <div id="pencilProperties"></div>
183 <div id="brushProperties"></div> 168 <div id="brushProperties"></div>
184 <div id="fillProperties"></div> 169 <div id="fillProperties"></div>
185 <div id="inkbottleProperties"></div> 170 <div id="inkbottleProperties"></div>
186 <div id="eyedropperProperties"></div>
187 <div id="eraserProperties"></div> 171 <div id="eraserProperties"></div>
188 <div id="rotateStageProperties"></div> 172 <div id="rotateStageProperties"></div>
189 <div id="panProperties"></div> 173 <div id="panProperties"></div>
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css
index 7f1b0f7f..0912dd7e 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.css
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css
@@ -3,4 +3,26 @@
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6
7 .optionsBrushTool {