aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/icon.reel
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-02 16:28:39 -0700
committerJohn Mayhew2012-04-02 16:28:39 -0700
commitb4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/components/ui/icon-list-basic/icon.reel
parent5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
Diffstat (limited to 'js/components/ui/icon-list-basic/icon.reel')
-rw-r--r--js/components/ui/icon-list-basic/icon.reel/icon.css2
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js16
2 files changed, 7 insertions, 11 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index 9fb180d2..203db65c 100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -35,7 +35,7 @@
35 35
36.icon .iconLabel{ 36.icon .iconLabel{
37 margin-top:8px; 37 margin-top:8px;
38 white-space: nowrap; 38 white-space: pre;
39 text-overflow: ellipsis; 39 text-overflow: ellipsis;
40 line-height:15px; 40 line-height:15px;
41 overflow: hidden; 41 overflow: hidden;
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..7d36bc59 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -86,7 +86,7 @@ var Icon = exports.Icon = Montage.create(Component, {
86 this.metadata = "Name: "+this.icondata.name; 86 this.metadata = "Name: "+this.icondata.name;
87 } 87 }
88 this.metadata = this.metadata + "<br />" + "Type: "+this.icondata.type; 88 this.metadata = this.metadata + "<br />" + "Type: "+this.icondata.type;
89 if(this.icondata.size){this.metadata = this.metadata + "<br />" + "Size: "+this.icondata.size;} 89 if(this.icondata.size){this.metadata = this.metadata + "<br />" + "Size: "+this.icondata.size+ " bytes";}
90 if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);} 90 if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);}
91 if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);} 91 if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);}
92 92
@@ -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 }