Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
Tom Needham
|
Before Width: | Height: | Size: 591 B After Width: | Height: | Size: 591 B |
|
Before Width: | Height: | Size: 691 B After Width: | Height: | Size: 691 B |
|
Before Width: | Height: | Size: 481 B After Width: | Height: | Size: 481 B |
|
Before Width: | Height: | Size: 342 B |
|
Before Width: | Height: | Size: 675 B After Width: | Height: | Size: 675 B |
|
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 524 B |
|
Before Width: | Height: | Size: 578 B After Width: | Height: | Size: 578 B |
|
Before Width: | Height: | Size: 621 B After Width: | Height: | Size: 621 B |
|
Before Width: | Height: | Size: 587 B After Width: | Height: | Size: 587 B |
|
Before Width: | Height: | Size: 700 B After Width: | Height: | Size: 700 B |
|
Before Width: | Height: | Size: 603 B After Width: | Height: | Size: 603 B |
|
|
@ -3,7 +3,7 @@ FileList={
|
||||||
$('#fileList').empty().html(fileListHtml);
|
$('#fileList').empty().html(fileListHtml);
|
||||||
},
|
},
|
||||||
addFile:function(name,size,lastModified,loading){
|
addFile:function(name,size,lastModified,loading){
|
||||||
var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file');
|
var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
|
||||||
var html='<tr data-file="'+name+'" data-type="file" data-size="'+size+'">';
|
var html='<tr data-file="'+name+'" data-type="file" data-size="'+size+'">';
|
||||||
if(name.indexOf('.')!=-1){
|
if(name.indexOf('.')!=-1){
|
||||||
var basename=name.substr(0,name.lastIndexOf('.'));
|
var basename=name.substr(0,name.lastIndexOf('.'));
|
||||||
|
|
|
||||||
|
|
@ -101,20 +101,20 @@ class OC_Helper {
|
||||||
|
|
||||||
// Is it a dir?
|
// Is it a dir?
|
||||||
if( $mimetype == "dir" ){
|
if( $mimetype == "dir" ){
|
||||||
return OC::$WEBROOT."/core/img/places/folder.svg";
|
return OC::$WEBROOT."/core/img/filetypes/folder.png";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Icon exists?
|
// Icon exists?
|
||||||
if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
|
if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
|
||||||
return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
|
return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
|
||||||
}
|
}
|
||||||
//try only the first part of the filetype
|
//try only the first part of the filetype
|
||||||
$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
|
$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
|
||||||
if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
|
if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
|
||||||
return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
|
return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
return OC::$WEBROOT."/core/img/filetypes/file.svg";
|
return OC::$WEBROOT."/core/img/filetypes/file.png";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||