diff options
author | Robin Appelman <icewind@owncloud.com> | 2012-10-02 23:29:13 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2012-10-02 23:29:13 +0200 |
commit | ac44506b401f973e8757809209b5989c11573cc4 (patch) | |
tree | 57d929ad2af67444ae9d085523744d3ec6216f1e /apps/files/js | |
parent | b7eb3f3dff93762483f6b5a6d647d4855595f318 (diff) | |
parent | 32a6b3b8626041a6bd7eb259629273ee8feaba55 (diff) | |
download | nextcloud-server-ac44506b401f973e8757809209b5989c11573cc4.tar.gz nextcloud-server-ac44506b401f973e8757809209b5989c11573cc4.zip |
Merge branch 'master' into filesystem
Diffstat (limited to 'apps/files/js')
-rw-r--r-- | apps/files/js/filelist.js | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 683f7db8678..4bce4a624ef 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -157,22 +157,21 @@ var FileList={ }); } - - tr.attr('data-file', newname); - var path = td.children('a.name').attr('href'); - td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname))); - if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { - var basename=newname.substr(0,newname.lastIndexOf('.')); - } else { - var basename=newname; - } - td.children('a.name').empty(); - var span=$('<span class="nametext"></span>'); - span.text(basename); - td.children('a.name').append(span); - if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { - span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>')); - } + } + tr.attr('data-file', newname); + var path = td.children('a.name').attr('href'); + td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname))); + if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { + var basename=newname.substr(0,newname.lastIndexOf('.')); + } else { + var basename=newname; + } + td.children('a.name').empty(); + var span=$('<span class="nametext"></span>'); + span.text(basename); + td.children('a.name').append(span); + if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { + span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>')); } return false; }); |