3 files changed, 75 insertions, 3 deletions

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 1956fda0077..8dd26d71c3e 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -478,8 +478,21 @@
 			}, function (filename, context) {
 				var dir = context.dir || context.fileList.getCurrentDirectory();
 				var url = context.fileList.getDownloadUrl(filename, dir);
+
+				var downloadFileaction = $(context.$file).find('.fileactions .action-download');
+
+				// don't allow a second click on the download action
+				if(downloadFileaction.hasClass('disabled')) {
+					return;
+				}
+
 				if (url) {
-					OC.redirect(url);
+					var disableLoadingState = function(){
+							OCA.Files.FileActions.updateFileActionSpinner(downloadFileaction, false);
+						};
+
+					OCA.Files.FileActions.updateFileActionSpinner(downloadFileaction, true);
+					OCA.Files.Files.handleDownload(url, disableLoadingState);
 				}
 			}, t('files', 'Download'));
 		}
@@ -488,6 +501,26 @@
 	OCA.Files.FileActions = FileActions;
 
 	/**
+	 * Replaces the download icon with a loading spinner and vice versa
+	 * - also adds the class disabled to the passed in element
+	 *
+	 * @param downloadButtonElement download fileaction
+	 * @param {boolean} showIt whether to show the spinner(true) or to hide it(false)
+	 */
+	OCA.Files.FileActions.updateFileActionSpinner = function(downloadButtonElement, showIt) {
+		var icon = downloadButtonElement.find('img'),
+			sourceImage = icon.attr('src');
+
+		if(showIt) {
+			downloadButtonElement.addClass('disabled');
+			icon.attr('src', sourceImage.replace('actions/download.svg', 'loading-small.gif'));
+		} else {
+			downloadButtonElement.removeClass('disabled');
+			icon.attr('src', sourceImage.replace('loading-small.gif', 'actions/download.svg'));
+		}
+	};
+
+	/**
 	 * File action attributes.
 	 *
 	 * @todo make this a real class in the future
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 8236ef3b4ac..a7d4e41d0e0 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -417,7 +417,21 @@
 			else {
 				files = _.pluck(this.getSelectedFiles(), 'name');
 			}
-			OC.redirect(this.getDownloadUrl(files, dir));
+
+			var downloadFileaction = $('#selectedActionsList').find('.download');
+
+			// don't allow a second click on the download action
+			if(downloadFileaction.hasClass('disabled')) {
+				event.preventDefault();
+				return;
+			}
+
+			var disableLoadingState = function(){
+				OCA.Files.FileActions.updateFileActionSpinner(downloadFileaction, false);
+			};
+
+			OCA.Files.FileActions.updateFileActionSpinner(downloadFileaction, true);
+			OCA.Files.Files.handleDownload(this.getDownloadUrl(files, dir), disableLoadingState);
 			return false;
 		},
 
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 034045ee40b..19cc3b26e44 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -271,8 +271,33 @@
 				FileList.scrollTo(getURLParameter('scrollto'));
 			}
 			*/
+		},
+
+		/**
+		 * Handles the download and calls the callback function once the download has started
+		 * - browser sends download request and adds parameter with a token
+		 * - server notices this token and adds a set cookie to the download response
+		 * - browser now adds this cookie for the domain
+		 * - JS periodically checks for this cookie and then knows when the download has started to call the callback
+		 *
+		 * @param {string} url download URL
+		 * @param {function} callback function to call once the download has started
+		 */
+		handleDownload: function(url, callback) {
+			var randomToken = Math.random().toString(36).substring(2),
+				checkForDownloadCookie = function() {
+					if (!OC.Util.isCookieSetToValue('ocDownloadStarted', randomToken)){
+						return false;
+					} else {
+						callback();
+						return true;
+					}
+				};
+
+			OC.redirect(url + '&downloadStartSecret=' + randomToken);
+			OC.Util.waitFor(checkForDownloadCookie, 500);
 		}
-	}
+	};
 
 	Files._updateStorageStatisticsDebounced = _.debounce(Files._updateStorageStatistics, 250);
 	OCA.Files.Files = Files;