diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2012-09-19 12:03:58 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2012-09-19 12:03:58 +0200 |
| commit | c199c4ad67737754c2274a97e3137cee33b7e2d9 (patch) | |
| tree | 01fb451f21a6fb4cc51259885f3aa2c95610039f /apps/files/js | |
| parent | 6596094a284f8e800a2b50f9cf82973ce7daea2f (diff) | |
| parent | 518ca0ac58c7cf762d0fc51f75cc886cedd495b0 (diff) | |
| download | nextcloud-server-c199c4ad67737754c2274a97e3137cee33b7e2d9.tar.gz nextcloud-server-c199c4ad67737754c2274a97e3137cee33b7e2d9.zip | |
Merge branch 'master' of github.com:owncloud/core
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index f2e04256231..fd4cee90fd1 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -157,7 +157,7 @@ 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) { + if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { var basename=newname.substr(0,newname.lastIndexOf('.')); } else { var basename=newname; @@ -166,7 +166,7 @@ var FileList={ var span=$('<span class="nametext"></span>'); span.text(basename); td.children('a.name').append(span); - if (newname.indexOf('.') > 0) { + if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>')); } tr.data('renaming',false); |