summaryrefslogtreecommitdiffstats
path: root/files/js/filelist.js
diff options
context:
space:
mode:
authorGeorg Ehrke <georg.stefan.germany@googlemail.com>2011-10-13 21:59:16 +0200
committerGeorg Ehrke <georg.stefan.germany@googlemail.com>2011-10-13 21:59:16 +0200
commita01d10e57db1893939d0a7706fad239df537e24b (patch)
tree3649dab6d0006981225f88574b26447f9fbeac1f /files/js/filelist.js
parent4cbae823eb742fac80288c6c74acba26e0a9c5d6 (diff)
parentdb2fb38746bb9d89b402c3a768a247945d813989 (diff)
downloadnextcloud-server-a01d10e57db1893939d0a7706fad239df537e24b.tar.gz
nextcloud-server-a01d10e57db1893939d0a7706fad239df537e24b.zip
Merge branch 'master' into calendar
Diffstat (limited to 'files/js/filelist.js')
-rw-r--r--files/js/filelist.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/files/js/filelist.js b/files/js/filelist.js
index 84762bb561d..e6da922700d 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -101,10 +101,14 @@ FileList={
$('.file_upload_filename').removeClass('highlight');
},
loadingDone:function(name){
- $('tr[data-file="'+name+'"]').data('loading',false);
- var mime=$('tr[data-file="'+name+'"]').data('mime');
- $('tr[data-file="'+name+'"] td.filename').attr('style','background-image:url('+getMimeIcon(mime)+')');
- $('tr[data-file="'+name+'"] td.filename').draggable(dragOptions);
+ var tr=$('tr[data-file="'+name+'"]');
+ tr.data('loading',false);
+ var mime=tr.data('mime');
+ tr.attr('data-mime',mime);
+ getMimeIcon(mime,function(path){
+ tr.find('td.filename').attr('style','background-image:url('+path+')');
+ });
+ tr.find('td.filename').draggable(dragOptions);
},
isLoading:function(name){
return $('tr[data-file="'+name+'"]').data('loading');