diff options
author | Valerio Virgillito | 2012-02-24 10:20:14 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-24 10:20:14 -0800 |
commit | 23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (patch) | |
tree | 622483bfd66d02c03262c295109dc37e361582ba /js/data | |
parent | 5de5dc6454fe6ca097ce4baf34768c9174a827d9 (diff) | |
parent | 3cf5f167c1d19b28306f30060266c10cda226ea9 (diff) | |
download | ninja-23a22195f42f8d7025cd4c70eab9ec26a19c1dc1.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/tools-data.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 00de9236..cf48757d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
@@ -153,21 +153,21 @@ 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", |