diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 17:28:30 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 17:28:30 +0100 |
| commit | d67d9566ce37e63c4df62d1f57fb03540421895c (patch) | |
| tree | 5b6d5d0002f962f04c4706b3a722991a8e68c6ab /apps/files/js/filelist.js | |
| parent | 9dddcae9ca3dcf872893e36e2f478ebecafdc6e2 (diff) | |
| parent | 5a309c11ca90589303c38084795432d3d23e393d (diff) | |
| download | nextcloud-server-d67d9566ce37e63c4df62d1f57fb03540421895c.tar.gz nextcloud-server-d67d9566ce37e63c4df62d1f57fb03540421895c.zip | |
Merge branch 'master' into clean-app-id
Diffstat (limited to 'apps/files/js/filelist.js')
| -rw-r--r-- | apps/files/js/filelist.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 72b353b48c2..4a66b33694d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -15,7 +15,7 @@ var FileList={ extension=false; } html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />'; - html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '<').replace(/>/, '>')+'/'+escapeHTML(name)+'"><span class="nametext">'+escapeHTML(basename); + html+='<a class="name" href="' +OC.Router.generate('download', { file: $('#dir').val()+'/'+name }) +'"><span class="nametext">'+escapeHTML(basename); if(extension){ html+='<span class="extension">'+escapeHTML(extension)+'</span>'; } @@ -216,9 +216,6 @@ var FileList={ }, replace:function(oldName, newName, isNewFile) { // Finish any existing actions - if (FileList.lastAction || !FileList.useUndo) { - FileList.lastAction(); - } $('tr').filterAttr('data-file', oldName).hide(); $('tr').filterAttr('data-file', newName).hide(); var tr = $('tr').filterAttr('data-file', oldName).clone(); @@ -321,7 +318,6 @@ $(document).ready(function(){ // Delete the new uploaded file FileList.deleteCanceled = false; FileList.deleteFiles = [FileList.replaceOldName]; - FileList.finishDelete(null, true); } else { $('tr').filterAttr('data-file', FileList.replaceOldName).show(); } @@ -348,7 +344,6 @@ $(document).ready(function(){ if ($('#notification').data('isNewFile')) { FileList.deleteCanceled = false; FileList.deleteFiles = [$('#notification').data('oldName')]; - FileList.finishDelete(null, true); } }); FileList.useUndo=(window.onbeforeunload)?true:false; |