diff options
author | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
commit | d59cb51c275fbbef84604f9ed77afedba8168099 (patch) | |
tree | 7d3f51c20eb6b6940c1ce648d828fa1e2d8d510b /js/components/layout/tools-list.reel/tools-list.js | |
parent | 857aafee732b6a85fa155ff4a05d1b8fde48f09d (diff) | |
parent | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (diff) | |
download | ninja-d59cb51c275fbbef84604f9ed77afedba8168099.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.js')
-rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.js | 6 |
1 files changed, 0 insertions, 6 deletions
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 | 68 | ||
74 | this.EyedropperTool.options = this.application.ninja.toolsProperties.eyedropperProperties; | ||
75 | this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties; | 69 | this.EraserTool.options = this.application.ninja.toolsProperties.eraserProperties; |
76 | this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties; | 70 | this.RotateStageTool3D.options = this.application.ninja.toolsProperties.rotateStageProperties; |
77 | this.PanTool.options = this.application.ninja.toolsProperties.panProperties; | 71 | this.PanTool.options = this.application.ninja.toolsProperties.panProperties; |