summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJuan Carlos Cornejo <jc2@paintblack.com>2012-08-22 17:08:10 -0400
committerJuan Carlos Cornejo <jc2@paintblack.com>2012-08-22 17:08:10 -0400
commit0944b4455bd779d432cd0d61f8f55e00f6d34b7a (patch)
tree3eee6533d6b06944e86de6fadb9e206f16512159 /apps
parent24a207a8facea698ec445beaf9271419145e152b (diff)
downloadnextcloud-server-0944b4455bd779d432cd0d61f8f55e00f6d34b7a.tar.gz
nextcloud-server-0944b4455bd779d432cd0d61f8f55e00f6d34b7a.zip
Moves the lastAction=null outside the if so it can include the undo requests from replace
Diffstat (limited to 'apps')
-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 d93781c47f9..e0cf516411a 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -298,13 +298,13 @@ $(document).ready(function(){
});
FileList.deleteCanceled=true;
FileList.deleteFiles=null;
- FileList.lastAction = null;
} else if (FileList.replaceOldName && FileList.replaceNewName) {
$('tr').filterAttr('data-file', FileList.replaceOldName).show();
FileList.replaceCanceled = true;
FileList.replaceOldName = null;
FileList.replaceNewName = null;
}
+ FileList.lastAction = null;
$('#notification').fadeOut();
});
$('#notification .replace').live('click', function() {