summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2012-11-15 17:16:18 +0100
committerBjörn Schießle <schiessle@owncloud.com>2012-11-15 17:16:18 +0100
commit8a93cc14f66b6d2d725ae52ce0bf632a03fac59d (patch)
tree9fc43e276b69adb1753972fc0a302a0951e1bd91
parentfd060d48493480bec6e25898812bf3b0fb0f3578 (diff)
downloadnextcloud-server-8a93cc14f66b6d2d725ae52ce0bf632a03fac59d.tar.gz
nextcloud-server-8a93cc14f66b6d2d725ae52ce0bf632a03fac59d.zip
port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.'
-rw-r--r--apps/files/js/filelist.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ac2e0d63588..f754a7cd162 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -160,11 +160,11 @@ var FileList={
OC.dialogs.alert(result.data.message, 'Error moving file');
newname = name;
}
- tr.data('renaming',false);
});
}
}
+ tr.data('renaming',false);
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)));