summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-02-09 03:28:40 -0800
committerBernhard Posselt <nukeawhale@gmail.com>2013-02-09 03:28:40 -0800
commitab4ae2b952fedf7bac2810bb6be7997fb661a1fc (patch)
tree04b5dd39989d065f9e766ec1654b53a8c80d7286 /apps/files/js
parent800609aaeb67d954103c349e685f33cdd0169291 (diff)
parent8961e675c77eefa9b44ea992131218982351f1ff (diff)
downloadnextcloud-server-ab4ae2b952fedf7bac2810bb6be7997fb661a1fc.tar.gz
nextcloud-server-ab4ae2b952fedf7bac2810bb6be7997fb661a1fc.zip
Merge pull request #1560 from owncloud/fix_replacing
remove (comment out) old code to fix replacing of files
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e4c71d41b2a..5ee55256eaa 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -216,9 +216,9 @@ var FileList={
},
replace:function(oldName, newName, isNewFile) {
// Finish any existing actions
- if (FileList.lastAction || !FileList.useUndo) {
+ /*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();