aboutsummaryrefslogtreecommitdiff
path: root/js/data/tools-data.js
diff options
context:
space:
mode:
authorhwc4872012-05-31 17:11:08 -0700
committerhwc4872012-05-31 17:11:08 -0700
commit1c445cf5d905f79937998cf2f1115594ea8c1074 (patch)
tree35271ad7ffec86fde9102af3dd954fa3a2974582 /js/data/tools-data.js
parent335ce503996e3ccbd2909086328d0a31fbd03370 (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/io/system/ninjalibrary.json
Diffstat (limited to 'js/data/tools-data.js')
-rwxr-xr-xjs/data/tools-data.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 32eaf24d..05455efe 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -60,6 +60,7 @@ exports.ToolsData = Montage.create(Montage, {
60 "cursor": "auto", 60 "cursor": "auto",
61 "lastInGroup": false, 61 "lastInGroup": false,
62 "container": false, 62 "container": false,
63 "subtools": [],
63 "selected": true 64 "selected": true
64 }, 65 },
65 { 66 {
@@ -71,6 +72,7 @@ exports.ToolsData = Montage.create(Montage, {
71 "cursor": "auto", 72 "cursor": "auto",
72 "lastInGroup": false, 73 "lastInGroup": false,
73 "container": false, 74 "container": false,
75 "subtools": [],
74 "selected": false 76 "selected": false
75 }, 77 },
76 { 78 {
@@ -82,6 +84,7 @@ exports.ToolsData = Montage.create(Montage, {
82 "cursor": "auto", 84 "cursor": "auto",
83 "lastInGroup": true, 85 "lastInGroup": true,
84 "container": false, 86 "container": false,
87 "subtools": [],
85 "selected": false 88 "selected": false
86 }, 89 },
87 { 90 {
@@ -93,6 +96,7 @@ exports.ToolsData = Montage.create(Montage, {
93 "cursor": "url('images/cursors/Crosshair.png') 8 8, default", 96 "cursor": "url('images/cursors/Crosshair.png') 8 8, default",
94 "lastInGroup": false, 97 "lastInGroup": false,
95 "container": false, 98 "container": false,
99 "subtools": [],
96 "selected": false 100 "selected": false
97 }, 101 },
98 { 102 {
@@ -104,6 +108,7 @@ exports.ToolsData = Montage.create(Montage, {
104 "cursor": "auto", 108 "cursor": "auto",
105 "lastInGroup": false, 109 "lastInGroup": false,
106 "container": false, 110 "container": false,
111 "subtools": [],
107 "selected": false 112 "selected": false
108 }, 113 },
109 { 114 {
@@ -115,6 +120,7 @@ exports.ToolsData = Montage.create(Montage, {
115 "cursor": "text", 120 "cursor": "text",
116 "lastInGroup": false, 121 "lastInGroup": false,
117 "container": false, 122 "container": false,
123 "subtools": [],
118 "selected": false 124 "selected": false
119 }, 125 },
120 { 126 {
@@ -163,6 +169,7 @@ exports.ToolsData = Montage.create(Montage, {
163 "cursor": "url('images/tools/brush_down.png') 9 17, default", 169 "cursor": "url('images/tools/brush_down.png') 9 17, default",
164 "lastInGroup": false, 170 "lastInGroup": false,
165 "container": false, 171 "container": false,
172 "subtools": [],
166 "selected": false 173 "selected": false
167 }, 174 },
168 { 175 {
@@ -174,6 +181,7 @@ exports.ToolsData = Montage.create(Montage, {
174 "cursor": "url('images/tools/bucket_down.png'), default", 181 "cursor": "url('images/tools/bucket_down.png'), default",
175 "lastInGroup": false, 182 "lastInGroup": false,
176 "container": false, 183 "container": false,
184 "subtools": [],
177 "selected": false 185 "selected": false
178 }, 186 },
179 { 187 {
@@ -185,6 +193,7 @@ exports.ToolsData = Montage.create(Montage, {
185 "cursor": "url('images/tools/inkbottle_cursor.png'), default", 193 "cursor": "url('images/tools/inkbottle_cursor.png'), default",
186 "lastInGroup": true, 194 "lastInGroup": true,
187 "container": false, 195 "container": false,
196 "subtools": [],
188 "selected": false 197 "selected": false
189 }, 198 },
190// { 199// {
@@ -196,6 +205,7 @@ exports.ToolsData = Montage.create(Montage, {
196// "cursor": "auto", 205// "cursor": "auto",
197// "lastInGroup": false, 206// "lastInGroup": false,
198// "container": false, 207// "container": false,
208// "subtools": [],
199// "selected": false 209// "selected": false
200// }, 210// },
201 { 211 {
@@ -207,6 +217,7 @@ exports.ToolsData = Montage.create(Montage, {
207 "cursor": "auto", 217 "cursor": "auto",
208 "lastInGroup": false, 218 "lastInGroup": false,
209 "container": false, 219 "container": false,
220 "subtools": [],
210 "selected": false 221 "selected": false
211 }, 222 },
212 { 223 {
@@ -218,6 +229,7 @@ exports.ToolsData = Montage.create(Montage, {
218 "cursor": "url('images/tools/hand_down.png'), default", 229 "cursor": "url('images/tools/hand_down.png'), default",
219 "lastInGroup": false, 230 "lastInGroup": false,
220 "container": false, 231 "container": false,
232 "subtools": [],
221 "selected": false 233 "selected": false
222 }, 234 },
223 { 235 {
@@ -229,6 +241,7 @@ exports.ToolsData = Montage.create(Montage, {
229 "cursor": "url('images/cursors/zoom.png'),default", 241 "cursor": "url('images/cursors/zoom.png'),default",
230 "lastInGroup": true, 242 "lastInGroup": true,
231 "container": false, 243 "container": false,
244 "subtools": [],
232 "selected": false 245 "selected": false
233 } 246 }
234 ] 247 ]