aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-13 11:15:34 -0700
committerValerio Virgillito2012-03-13 11:15:34 -0700
commitf6b958360d82854bdaf51848e7fd715d1f633179 (patch)
tree80f6c08bb730089bdd3f26310df8d2363f9ba863 /js/components/ui
parentc24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff)
parent4d7b86f55c504ee4e8c2460cf6b60cb9a2cf18f0 (diff)
downloadninja-f6b958360d82854bdaf51848e7fd715d1f633179.tar.gz
Merge pull request #105 from joseeight/FileIO-Build-Candidate
File I/O adding webGL/canvas data functionality
Diffstat (limited to 'js/components/ui')
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js14
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.js14
2 files changed, 10 insertions, 18 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 72adbfa1..1ef6e277 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -174,21 +174,17 @@ var Icon = exports.Icon = Montage.create(Component, {
174 enumerable: true, 174 enumerable: true,
175 value:{ 175 value:{
176 "img_root":"images/picker/", 176 "img_root":"images/picker/",
177 ".png":"png_file.png",
178 ".jpg":"jpeg_file.png",
179 ".js":"js_file.png", 177 ".js":"js_file.png",
178 ".json":"json_file.png",
180 ".css":"css_file.png", 179 ".css":"css_file.png",
181 ".html":"html_file.png", 180 ".html":"html_file.png",
182 ".xml":"xml_file.png", 181 ".xml":"xml_file.png",
183 ".php":"php_file.png", 182 ".php":"php_file.png",
183 ".pl":"pl_file.png",
184 ".py":"py_file.png",
185 ".rb":"rb_file.png",
184 ".doc":"doc_file.png", 186 ".doc":"doc_file.png",
185 ".docx":"doc_file.png", 187 ".txt":"txt_file.png",
186 ".rtf":"rtf_file.png",
187 ".pdf":"pdf_file.png",
188 ".zip":"zip_file.png",
189 ".rar":"zip_file.png",
190 ".app":"executable.png",
191 ".exe":"executable.png",
192 "file_default":"file.png", 188 "file_default":"file.png",
193 "directory":"folder.png" 189 "directory":"folder.png"
194 } 190 }
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
index 4c71cb6b..a67dad43 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
@@ -242,21 +242,17 @@ exports.TreeItem = Montage.create(Component, {
242 enumerable: true, 242 enumerable: true,
243 value:{ 243 value:{
244 "img_root":"images/picker/", 244 "img_root":"images/picker/",
245 ".png":"png_file.png",
246 ".jpg":"jpeg_file.png",
247 ".js":"js_file.png", 245 ".js":"js_file.png",
246 ".json":"json_file.png",
248 ".css":"css_file.png", 247 ".css":"css_file.png",
249 ".html":"html_file.png", 248 ".html":"html_file.png",
250 ".xml":"xml_file.png", 249 ".xml":"xml_file.png",
251 ".php":"php_file.png", 250 ".php":"php_file.png",
251 ".pl":"pl_file.png",
252 ".py":"py_file.png",
253 ".rb":"rb_file.png",
252 ".doc":"doc_file.png", 254 ".doc":"doc_file.png",
253 ".docx":"doc_file.png", 255 ".txt":"txt_file.png",
254 ".rtf":"rtf_file.png",
255 ".pdf":"pdf_file.png",
256 ".zip":"zip_file.png",
257 ".rar":"zip_file.png",
258 ".app":"executable.png",
259 ".exe":"executable.png",
260 "file_default":"file.png", 256 "file_default":"file.png",
261 "directory":"folder.png" 257 "directory":"folder.png"
262 } 258 }