aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/components/layout/tools-list.reel/tools-list.html12
-rw-r--r--js/data/tools-data.js28
2 files changed, 21 insertions, 19 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index c47359bf..2c5617e5 100644
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -26,15 +26,15 @@
26 }, 26 },
27 27
28 "groupLine": { 28 "groupLine": {
29 "module": "js/components/layout/tool-button.reel", 29 "module": "montage/ui/condition.reel",
30 "name": "ToolButton", 30 "name": "Condition",
31 "properties": { 31 "properties": {
32 "element": {"#": "groupLine"} 32 "element": {"#": "groupLine"}
33 }, 33 },
34 "bindings": { 34 "bindings": {
35 "data": { 35 "condition": {
36 "boundObject": {"@": "repetition1"}, 36 "boundObject": {"@": "repetition1"},
37 "boundObjectPropertyPath": "objectAtCurrentIteration", 37 "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
38 "oneway": true 38 "oneway": true
39 } 39 }
40 } 40 }
@@ -178,7 +178,9 @@
178 <div id="toolsList" class="toolsList"> 178 <div id="toolsList" class="toolsList">
179 <div id="toolscontainer" class="toolscontainer"> 179 <div id="toolscontainer" class="toolscontainer">
180 <div id="toolbutton" class="toolbutton"></div> 180 <div id="toolbutton" class="toolbutton"></div>
181 <hr id="groupLine" /> 181 <div id="groupLine">
182 <hr />
183 </div>
182 </div> 184 </div>
183 <!-- TODO: Remove and add as a component --> 185 <!-- TODO: Remove and add as a component -->
184 <div id="colortoolbar"></div> 186 <div id="colortoolbar"></div>
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8356c422..4847fa7c 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -28,7 +28,7 @@ exports.ToolsData = Montage.create(Montage, {
28 "action": "SubselectionTool", 28 "action": "SubselectionTool",
29 "toolTip": "Subselect Tool", 29 "toolTip": "Subselect Tool",
30 "cursor": "auto", 30 "cursor": "auto",
31 "lastInGroup": false, 31 "lastInGroup": true,
32 "container": false, 32 "container": false,
33 "selected": false 33 "selected": false
34 }, 34 },
@@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, {
153 "action": "FillTool", 153 "action": "FillTool",
154 "toolTip": "Fill Tool", 154 "toolTip": "Fill Tool",
155 "cursor": "url('images/tools/bucket_down.png'), default", 155 "cursor": "url('images/tools/bucket_down.png'), default",
156 "lastInGroup": false, 156 "lastInGroup": true,
157 "container": false, 157 "container": false,
158 "selected": false 158 "selected": false
159 }, 159 },
@@ -168,17 +168,17 @@ exports.ToolsData = Montage.create(Montage, {
168// "container": false, 168// "container": false,
169// "selected": false 169// "selected": false
170// }, 170// },
171// { 171 {
172// "id": "EyedropperTool", 172 "id": "EyedropperTool",
173// "properties": "eyedropperProperties", 173 "properties": "eyedropperProperties",
174// "spriteSheet": true, 174 "spriteSheet": true,
175// "action": "EyedropperTool", 175 "action": "EyedropperTool",
176// "toolTip": "Eyedropper Tool", 176 "toolTip": "Eyedropper Tool",
177// "cursor": "url('images/tools/eyedropper_down.png'), default", 177 "cursor": "url('images/tools/eyedropper_down.png'), default",
178// "lastInGroup": false, 178 "lastInGroup": false,
179// "container": false, 179 "container": false,
180// "selected": false 180 "selected": false
181// }, 181 },
182// { 182// {
183// "id": "EraserTool", 183// "id": "EraserTool",
184// "properties": "eraserProperties", 184// "properties": "eraserProperties",
@@ -219,7 +219,7 @@ exports.ToolsData = Montage.create(Montage, {
219 "action": "ZoomTool", 219 "action": "ZoomTool",
220 "toolTip": "Zoom Tool (Z)", 220 "toolTip": "Zoom Tool (Z)",
221 "cursor": "url('images/cursors/zoom.png'),default", 221 "cursor": "url('images/cursors/zoom.png'),default",
222 "lastInGroup": false, 222 "lastInGroup": true,
223 "container": false, 223 "container": false,
224 "selected": false 224 "selected": false
225 } 225 }