aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-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.html27
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js49
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.css7
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html5
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js8
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js8
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.css22
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html11
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js83
-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/rect-properties.reel/rect-properties.js10
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.css8
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html10
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css25
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html16
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js125
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.css16
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html18
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js47
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html3
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js1
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.css10
-rwxr-xr-xjs/controllers/color-controller.js16
-rwxr-xr-xjs/data/tools-data.js24
-rwxr-xr-xjs/mediators/keyboard-mediator.js7
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js2836
-rw-r--r--js/tools/BrushTool.js2
-rwxr-xr-xjs/tools/LineTool.js6
-rwxr-xr-xjs/tools/OvalTool.js4
-rwxr-xr-xjs/tools/PenTool.js4
-rwxr-xr-xjs/tools/PencilTool.js32
-rwxr-xr-xjs/tools/RectTool.js4
38 files changed, 1886 insertions, 1672 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 9aa05e5d..0c51aa9a 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 data-montage-id="disabledCondition" class="panelDisabled"></div> 164 <div data-montage-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 10309ec4..a24ce658 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":