From 1e880feab1300eb54e9ce82438733ef3c5548a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 19 Sep 2012 11:56:31 +0200
Subject: [PATCH] execute lastAction() before add new one

---
 apps/files/js/filelist.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index f2b558496e..f2e0425623 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -255,20 +255,23 @@ var FileList={
 	},
 	do_delete:function(files){
 		// Finish any existing actions
-		if (FileList.lastAction || !FileList.useUndo) {
-			if(!FileList.deleteFiles) {
-				FileList.prepareDeletion(files);
-			}
+		if (FileList.lastAction) {
 			FileList.lastAction();
 		}
+		
 		FileList.prepareDeletion(files);
-		// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
-		if ($('#dir').val() == '/Shared') {
-			$('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+		
+		if (!FileList.useUndo) {
+			FileList.lastAction();
 		} else {
-			$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+			// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
+			if ($('#dir').val() == '/Shared') {
+				$('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+			} else {
+				$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+			}
+			$('#notification').fadeIn();
 		}
-		$('#notification').fadeIn();
 	},
 	finishDelete:function(ready,sync){
 		if(!FileList.deleteCanceled && FileList.deleteFiles){