diff options
author | Jon Reid | 2012-05-22 10:40:40 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-22 10:40:40 -0700 |
commit | d43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch) | |
tree | 1c78ccc588f04bac9bff4de82e527a128162cf4f /js/components | |
parent | 1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff) | |
parent | 0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff) | |
download | ninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components')
42 files changed, 701 insertions, 369 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; | |||
10 | exports.ToolsList = Montage.create(Component, { | 10 | exports.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; | 50 | this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties; |
54 | 51 | ||
55 | this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties; | 52 | this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties; |
56 | this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties; | ||
57 | 53 | ||
58 | this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; | 54 | this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; |
59 | this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; | 55 | this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; |
@@ -68,10 +64,8 @@ exports.ToolsList = Montage.create(Component, { | |||
68 | this.OvalTool.options = this.application.ninja.toolsProperties.shapeProperties.ovalProperties; | 64 | this.OvalTool.options = this.application.ninja.toolsProperties.shapeProperties.ovalProperties; |
69 | this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties; | 65 | this.RectTool.options = this.application.ninja.toolsProperties.shapeProperties.rectProperties; |
70 | this.LineTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties; | 66 | 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; | 67 | this.BrushTool.options = this.application.ninja.toolsProperties.brushProperties; |
73 |