diff options
author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/data | |
parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/tools-data.js | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 4847fa7c..cf48757d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
@@ -153,28 +153,28 @@ 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, | ||
157 | "container": false, | ||
158 | "selected": false | ||
159 | }, | ||
160 | { | ||
161 | "id": "InkBottleTool", | ||
162 | "properties": "inkbottleProperties", | ||
163 | "spriteSheet": true, | ||
164 | "action": "InkBottleTool", | ||
165 | "toolTip": "Ink Bottle Tool", | ||
166 | "cursor": "url('images/tools/inkbottle_down.png'), default", | ||
156 | "lastInGroup": true, | 167 | "lastInGroup": true, |
157 | "container": false, | 168 | "container": false, |
158 | "selected": false | 169 | "selected": false |
159 | }, | 170 | }, |
160 | // { | ||
161 | // "id": "InkBottleTool", | ||
162 | // "properties": "inkbottleProperties", | ||
163 | // "spriteSheet": true, | ||
164 | // "action": "InkBottleTool", | ||
165 | // "toolTip": "Ink Bottle Tool", | ||
166 | // "cursor": "url('images/tools/inkbottle_down.png'), default", | ||
167 | // "lastInGroup": false, | ||
168 | // "container": false, | ||
169 | // "selected": false | ||
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') 6 20, default", |
178 | "lastInGroup": false, | 178 | "lastInGroup": false, |
179 | "container": false, | 179 | "container": false, |
180 | "selected": false | 180 | "selected": false |