aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJon Reid2012-05-22 10:40:40 -0700
committerJon Reid2012-05-22 10:40:40 -0700
commitd43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch)
tree1c78ccc588f04bac9bff4de82e527a128162cf4f /js
parent1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff)
parent0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff)
downloadninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html14
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js6
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html24
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css1
-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.css8
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html19
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js51
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css17
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html32
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js48
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js8
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.js18
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js8
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html23
-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.css6
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html14
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js10
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.css3
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html71
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.js30
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css16
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html33
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js126
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html32
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.js14
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.css1
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html46
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js47
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css28
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html55
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js1
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.css10
-rwxr-xr-xjs/controllers/color-controller.js16
-rwxr-xr-xjs/data/tools-data.js76
-rwxr-xr-xjs/mediators/keyboard-mediator.js43
-rwxr-xr-xjs/ninja.reel/ninja.js6
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js2836
-rwxr-xr-xjs/panels/properties.reel/properties.css15
-rw-r--r--js/tools/BrushTool.js2
-rwxr-xr-xjs/tools/FillTool.js7
-rwxr-xr-xjs/tools/InkBottleTool.js2
-rwxr-xr-xjs/tools/LineTool.js6
-rwxr-xr-xjs/tools/OvalTool.js4
-rwxr-xr-xjs/tools/PenTool.js6
-rwxr-xr-xjs/tools/PencilTool.js32
-rwxr-xr-xjs/tools/RectTool.js4
-rwxr-xr-xjs/tools/TagTool.js5
57 files changed, 2220 insertions, 1910 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..d5c33624 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -55,9 +55,6 @@
55 "SelectionTool1": { 55 "SelectionTool1": {
56 "prototype": "js/tools/SelectionTool" 56 "prototype": "js/tools/SelectionTool"
57 }, 57 },
58 "SubselectionTool1": {
59 "prototype": "js/tools/SubSelectTool"
60 },
61 "Rotate3DTool1": { 58 "Rotate3DTool1": {
62 "prototype": "js/tools/RotateObject3DTool" 59 "prototype": "js/tools/RotateObject3DTool"
63 }, 60 },
@@ -85,9 +82,6 @@
85 "LineTool1": { 82 "LineTool1": {
86 "prototype": "js/tools/LineTool" 83 "prototype": "js/tools/LineTool"
87 }, 84 },
88 "PencilTool1": {
89 "prototype": "js/tools/PencilTool"
90 },
91 "BrushTool1": { 85 "BrushTool1": {
92 "prototype": "js/tools/BrushTool" 86 "prototype": "js/tools/BrushTool"
93 }, 87 },
@@ -97,9 +91,6 @@
97 "InkBottleTool1": { 91 "InkBottleTool1": {
98 "prototype": "js/tools/InkBottleTool" 92 "prototype": "js/tools/InkBottleTool"
99 }, 93 },
100 "EyedropperTool1": {
101 "prototype": "js/tools/EyedropperTool"
102 },
103 "EraserTool1": { 94 "EraserTool1": {
104 "prototype": "js/tools/EraserTool" 95 "prototype": "js/tools/EraserTool"
105 }, 96 },
@@ -132,7 +123,6 @@
132 "properties": { 123 "properties": {
133 "element": {"#": "toolsList"}, 124 "element": {"#": "toolsList"},
134 "SelectionTool": {"@": "SelectionTool1"}, 125 "SelectionTool": {"@": "SelectionTool1"},
135 "SubselectionTool": {"@": "SubselectionTool1"},
136 "Rotate3DTool": {"@": "Rotate3DTool1"}, 126 "Rotate3DTool": {"@": "Rotate3DTool1"},
137 "Translate3DTool": {"@": "Translate3DTool1"}, 127 "Translate3DTool": {"@": "Translate3DTool1"},
138 "TagTool": {"@": "TagTool1"}, 128 "TagTool": {"@": "TagTool1"},
@@ -142,11 +132,9 @@
142 "OvalTool": {"@": "OvalTool1"}, 132 "OvalTool": {"@": "OvalTool1"},
143 "RectTool": {"@": "RectTool1"}, 133 "RectTool": {"@": "RectTool1"},
144 "LineTool": {"@": "LineTool1"}, 134 "LineTool": {"@": "LineTool1"},
145 "PencilTool": {"@": "PencilTool1"},
146 "BrushTool": {"@": "BrushTool1"}, 135 "BrushTool": {"@": "BrushTool1"},
147 "FillTool": {"@": "FillTool1"}, 136 "FillTool": {"@": "FillTool1"},
148 "InkBottleTool": {"@": "InkBottleTool1"}, 137 "InkBottleTool": {"@": "InkBottleTool1"},
149 "EyedropperTool": {"@": "EyedropperTool1"},
150 "EraserTool": {"@": "EraserTool1"}, 138 "EraserTool": {"@": "EraserTool1"},
151 "RotateStageTool3D": {"@": "RotateStageTool3D1"}, 139 "RotateStageTool3D": {"@": "RotateStageTool3D1"},
152 "PanTool": {"@": "PanTool1"}, 140 "PanTool": {"@": "PanTool1"},
@@ -169,8 +157,6 @@
169 <hr /> 157 <hr />
170 </div> 158 </div>
171 </div> 159 </div>
172 <!-- TODO: Remove and add as a component -->
173 <div id="colortoolbar"></div>
174 <div data-montage-id="disabledCondition" class="panelDisabled"></div> 160 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
175 </div> 161 </div>
176 162
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index d68e8a56..a10b6c3e 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -10,7 +10,6 @@ var Component = require("montage/ui/component").Component;
10exports.ToolsList = Montage.create(Component, { 10exports.ToolsList = Montage.create(Component, {
11 11
12 SelectionTool: { value: null }, 12 SelectionTool: { value: null },
13 SubselectionTool: { value: null },
14 Rotate3DTool: { value: null }, 13 Rotate3DTool: { value: null },
15 Translate3DTool: { value: null }, 14 Translate3DTool: { value: null },
16 TagTool: { value: null }, 15 TagTool: { value: null },
@@ -20,11 +19,9 @@ exports.ToolsList = Montage.create(Component, {
20 OvalTool: { value: null }, 19 OvalTool: { value: null },
21 RectTool: { value: null }, 20 RectTool: { value: null },
22 LineTool: { value: null }, 21 LineTool: { value: null },
23 PencilTool: { value: null },
24 BrushTool: { value: null }, 22 BrushTool: { value: null },
25 FillTool: { value: null }, 23 FillTool: { value: null },
26 InkBottleTool: { value: null }, 24 InkBottleTool: { value: null },
27 EyedropperTool: { value: null },
28 EraserTool: { value: null }, 25 EraserTool: { value: null },
29 RotateStageTool3D: { value: null }, 26 RotateStageTool3D: { value: null },
30 PanTool: { value: null }, 27 PanTool: { value: null },
@@ -53,7 +50,6 @@ exports.ToolsList = Montage.create(Component, {
53 this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties;