From 2607c565b01e83c9dcd68f4f905f94687841ae77 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 16 Dec 2012 16:19:51 -0500
Subject: Trigger the last action before continuing with a file upload, fixes
 issue #918

---
 apps/files/js/files.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'apps/files/js/files.js')

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 33c775fc8ec..2719e9ade5c 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -203,6 +203,9 @@ $(document).ready(function() {
 				var files = data.files;
 				var totalSize=0;
 				if(files){
+					if (FileList.lastAction) {
+						FileList.lastAction();
+					}
 					for(var i=0;i<files.length;i++){
 						if(files[i].size ==0 && files[i].type== '')
 						{
-- 
cgit v1.2.3


From 915126cae88c587cfe83dc08d0d541d0ca34c0c4 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 16 Dec 2012 16:25:08 -0500
Subject: Trigger last action before continuing with creating a new
 file/folder/from link

---
 apps/files/js/files.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'apps/files/js/files.js')

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 2719e9ade5c..d924dab3d60 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -516,6 +516,9 @@ $(document).ready(function() {
 				$('#notification').fadeIn();
 				return;
 			}
+			if (FileList.lastAction) {
+				FileList.lastAction();
+			}
 			var name = getUniqueName($(this).val());
 			if (name != $(this).val()) {
 				FileList.checkName(name, $(this).val(), true);
-- 
cgit v1.2.3