Fix reload call for all subclasses

All subclasses must also properly return the ajax call object.

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 400e3e28f001e411a7471bfad0bf6f335dd31502..9c6d31ee017bfab9589928ac2fecf1e4411662d6 100644 (file)
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -919,7 +919,9 @@
                                .addClass(direction === 'desc' ? this.SORT_INDICATOR_DESC_CLASS : this.SORT_INDICATOR_ASC_CLASS);
                },
                /**
-                * @brief Reloads the file list using ajax call
+                * Reloads the file list using ajax call
+                *
+                * @return ajax call object
                 */
                reload: function() {
                        this._selectedFiles = {};

diff --git a/apps/files_external/js/mountsfilelist.js b/apps/files_external/js/mountsfilelist.js
index 70b5b81e65b00627a56af21ae9ac365a7bae2076..0f61f78aac81e0fb7f0138a3881721c85179ac63 100644 (file)
--- a/apps/files_external/js/mountsfilelist.js
+++ b/apps/files_external/js/mountsfilelist.js
@@ -65,7 +65,6 @@
                },
 
                reload: function() {
-                       var self = this;
                        this.showMask();
                        if (this._reloadCall) {
                                this._reloadCall.abort();
@@ -78,14 +77,10 @@
                                type: 'GET',
                                beforeSend: function(xhr) {
                                        xhr.setRequestHeader('OCS-APIREQUEST', 'true');
-                               },
-                               error: function(result) {
-                                       self.reloadCallback(result);
-                               },
-                               success: function(result) {
-                                       self.reloadCallback(result);
                                }
                        });
+                       var callBack = this.reloadCallback.bind(this);
+                       return this._reloadCall.then(callBack, callBack);
                },
 
                reloadCallback: function(result) {

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 304f77a8d772fe5de79c48a717548c6ec508173a..c6dc0a4c862958550bb561a5639fa4c401ea1510 100644 (file)
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -95,7 +95,6 @@
                },
 
                reload: function() {
-                       var self = this;
                        this.showMask();
                        if (this._reloadCall) {
                                this._reloadCall.abort();
@@ -110,14 +109,10 @@
                                type: 'GET',
                                beforeSend: function(xhr) {
                                        xhr.setRequestHeader('OCS-APIREQUEST', 'true');
-                               },
-                               error: function(result) {
-                                       self.reloadCallback(result);
-                               },
-                               success: function(result) {
-                                       self.reloadCallback(result);
                                }
                        });
+                       var callBack = this.reloadCallback.bind(this);
+                       return this._reloadCall.then(callBack, callBack);
                },
 
                reloadCallback: function(result) {