1 files changed, 29 insertions, 10 deletions
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 5da34c52193..a839f396b9b 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -643,6 +643,10 @@ MountConfigListView.prototype = _.extend({
 		});
 
 		addSelect2(this.$el.find('tr:not(#addMountPoint) .applicableUsers'), this._userListLimit);
+		this.$el.tooltip({
+			selector: '.status span',
+			container: 'body'
+		});
 
 		this._initEvents();
 
@@ -709,11 +713,12 @@ MountConfigListView.prototype = _.extend({
 		}
 		highlightInput($target);
 		var $tr = $target.closest('tr');
+		this.updateStatus($tr, null);
 
 		var timer = $tr.data('save-timer');
 		clearTimeout(timer);
 		timer = setTimeout(function() {
-			self.saveStorageConfig($tr);
+			self.saveStorageConfig($tr, null, timer);
 		}, 2000);
 		$tr.data('save-timer', timer);
 	},
@@ -931,8 +936,9 @@ MountConfigListView.prototype = _.extend({
 	 *
 	 * @param $tr storage row
 	 * @param Function callback callback to call after save
+	 * @param concurrentTimer only update if the timer matches this
 	 */
-	saveStorageConfig:function($tr, callback) {
+	saveStorageConfig:function($tr, callback, concurrentTimer) {
 		var self = this;
 		var storage = this.getStorageConfig($tr);
 		if (!storage.validate()) {
@@ -942,15 +948,23 @@ MountConfigListView.prototype = _.extend({
 		this.updateStatus($tr, StorageConfig.Status.IN_PROGRESS);
 		storage.save({
 			success: function(result) {
-				self.updateStatus($tr, result.status);
-				$tr.attr('data-id', result.id);
-
-				if (_.isFunction(callback)) {
-					callback(storage);
+				if (concurrentTimer === undefined
+					|| $tr.data('save-timer') === concurrentTimer
+				) {
+					self.updateStatus($tr, result.status, result.statusMessage);
+					$tr.attr('data-id', result.id);
+
+					if (_.isFunction(callback)) {
+						callback(storage);
+					}
 				}
 			},
 			error: function() {
-				self.updateStatus($tr, StorageConfig.Status.ERROR);
+				if (concurrentTimer === undefined
+					|| $tr.data('save-timer') === concurrentTimer
+				) {
+					self.updateStatus($tr, StorageConfig.Status.ERROR);
+				}
 			}
 		});
 	},
@@ -971,7 +985,7 @@ MountConfigListView.prototype = _.extend({
 		this.updateStatus($tr, StorageConfig.Status.IN_PROGRESS);
 		storage.recheck({
 			success: function(result) {
-				self.updateStatus($tr, result.status);
+				self.updateStatus($tr, result.status, result.statusMessage);
 			},
 			error: function() {
 				self.updateStatus($tr, StorageConfig.Status.ERROR);
@@ -984,11 +998,15 @@ MountConfigListView.prototype = _.extend({
 	 *
 	 * @param {jQuery} $tr
 	 * @param {int} status
+	 * @param {string} message
 	 */
-	updateStatus: function($tr, status) {
+	updateStatus: function($tr, status, message) {
 		var $statusSpan = $tr.find('.status span');
 		$statusSpan.removeClass('loading-small success indeterminate error');
 		switch (status) {
+			case null:
+				// remove status
+				break;
 			case StorageConfig.Status.IN_PROGRESS:
 				$statusSpan.addClass('loading-small');
 				break;
@@ -1001,6 +1019,7 @@ MountConfigListView.prototype = _.extend({
 			default:
 				$statusSpan.addClass('error');
 		}
+		$statusSpan.attr('data-original-title', (typeof message === 'string') ? message : '');
 	},
 
 	/**