aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-05-31 10:13:40 -0700
committerAnanya Sen2012-05-31 10:13:40 -0700
commit286457b4f23974277274ba388afd283e8aa085cb (patch)
treec21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/layout/tools-list.reel
parent4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff)
parentd49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
downloadninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts: js/controllers/styles-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/layout/tools-list.reel')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html26
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js6
2 files changed, 2 insertions, 30 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..df603bf8 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -16,11 +16,7 @@
16 "element": {"#": "toolbutton"} 16 "element": {"#": "toolbutton"}
17 }, 17 },
18 "bindings": { 18 "bindings": {
19 "data": { 19 "data": {"<-": "@repetition1.objectAtCurrentIteration"}
20 "boundObject": {"@": "repetition1"},
21 "boundObjectPropertyPath": "objectAtCurrentIteration",
22 "oneway": true
23 }
24 } 20 }
25 }, 21 },
26 22
@@ -30,11 +26,7 @@
30 "element": {"#": "groupLine"} 26 "element": {"#": "groupLine"}
31 }, 27 },
32 "bindings": { 28 "bindings": {
33 "condition": { 29 "condition": {"<-": "@repetition1.objectAtCurrentIteration.lastInGroup"}
34 "boundObject": {"@": "repetition1"},
35 "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
36 "oneway": true
37 }
38 } 30 }
39 }, 31 },
40 32
@@ -55,9 +47,6 @@
55 "SelectionTool1": { 47 "SelectionTool1": {
56 "prototype": "js/tools/SelectionTool" 48 "prototype": "js/tools/SelectionTool"
57 }, 49 },
58 "SubselectionTool1": {
59 "prototype": "js/tools/SubSelectTool"
60 },
61 "Rotate3DTool1": { 50 "Rotate3DTool1": {
62 "prototype": "js/tools/RotateObject3DTool" 51 "prototype": "js/tools/RotateObject3DTool"
63 }, 52 },
@@ -85,9 +74,6 @@
85 "LineTool1": { 74 "LineTool1": {
86 "prototype": "js/tools/LineTool" 75 "prototype": "js/tools/LineTool"
87 }, 76 },
88 "PencilTool1": {
89 "prototype": "js/tools/PencilTool"
90 },
91 "BrushTool1": { 77 "BrushTool1": {
92 "prototype": "js/tools/BrushTool" 78 "prototype": "js/tools/BrushTool"
93 }, 79 },
@@ -97,9 +83,6 @@
97 "InkBottleTool1": { 83 "InkBottleTool1": {
98 "prototype": "js/tools/InkBottleTool" 84 "prototype": "js/tools/InkBottleTool"
99 }, 85 },
100 "EyedropperTool1": {
101 "prototype": "js/tools/EyedropperTool"
102 },
103 "EraserTool1": { 86 "EraserTool1": {
104 "prototype": "js/tools/EraserTool" 87 "prototype": "js/tools/EraserTool"
105 }, 88 },
@@ -132,7 +115,6 @@
132 "properties": { 115 "properties": {
133 "element": {"#": "toolsList"}, 116 "element": {"#": "toolsList"},
134 "SelectionTool": {"@": "SelectionTool1"}, 117 "SelectionTool": {"@": "SelectionTool1"},
135 "SubselectionTool": {"@": "SubselectionTool1"},
136 "Rotate3DTool": {"@": "Rotate3DTool1"}, 118 "Rotate3DTool": {"@": "Rotate3DTool1"},
137 "Translate3DTool": {"@": "Translate3DTool1"}, 119 "Translate3DTool": {"@": "Translate3DTool1"},
138 "TagTool": {"@": "TagTool1"}, 120 "TagTool": {"@": "TagTool1"},
@@ -142,11 +124,9 @@
142 "OvalTool": {"@": "OvalTool1"}, 124 "OvalTool": {"@": "OvalTool1"},
143 "RectTool": {"@": "RectTool1"}, 125 "RectTool": {"@": "RectTool1"},
144 "LineTool": {"@": "LineTool1"}, 126 "LineTool": {"@": "LineTool1"},
145 "PencilTool": {"@": "PencilTool1"},
146 "BrushTool": {"@": "BrushTool1"}, 127 "BrushTool": {"@": "BrushTool1"},
147 "FillTool": {"@": "FillTool1"}, 128 "FillTool": {"@": "FillTool1"},
148 "InkBottleTool": {"@": "InkBottleTool1"}, 129 "InkBottleTool": {"@": "InkBottleTool1"},
149 "EyedropperTool": {"@": "EyedropperTool1"},
150 "EraserTool": {"@": "EraserTool1"}, 130 "EraserTool": {"@": "EraserTool1"},
151 "RotateStageTool3D": {"@": "RotateStageTool3D1"}, 131 "RotateStageTool3D": {"@": "RotateStageTool3D1"},
152 "PanTool": {"@": "PanTool1"}, 132 "PanTool": {"@": "PanTool1"},
@@ -169,8 +149,6 @@
169 <hr /> 149 <hr />
170 </div> 150 </div>
171 </div> 151 </div>
172 <!-- TODO: Remove and add as a component -->
173 <div id="colortoolbar"></div>
174 <div data-montage-id="disabledCondition" class="panelDisabled"></div> 152 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
175 </div> 153 </div>
176 154
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; 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;