Add control of the state of previous fetch call in mail for Usermin

webmin · Jul 28, 2020 · 629437a · 629437a
1 parent 74c08b6
commit 629437a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/extensions/mail/mail.min.js b/extensions/mail/mail.min.js
diff --git a/extensions/mail/mail.min.js.gz b/extensions/mail/mail.min.js.gz
diff --git a/extensions/mail/mail.src.js b/extensions/mail/mail.src.js
@@ -2197,6 +2197,26 @@ const mail = (function() {
      */
     const messages = (function() {
 
+        /**
+         * Control the state of previous fetch call
+         */
+        const fetching = {
+            state: false,
+            initial: true,
+            abort: function() {
+                if (this.pending() === true &&
+                    this.initial === false) {
+                    this.state.abort();
+                }
+            },
+            pending: function() {
+                if (typeof this.state.state === "function" && this.state.state() === "pending") {
+                    return true;
+                }
+                return false;
+            },
+        };
+
         /**
          * Fetches and renders list of messages for the given folder with particular pagination
          *
@@ -2205,14 +2225,17 @@ const mail = (function() {
         const get = (data) => {
                 loader.start();
                 // _.notification('hide-all');
-                $.post(_.path.extensions + '/mail/messages.cgi?' + _.plugin.json_to_query(data),
+                fetching.abort();
+                fetching.state = $.post(_.path.extensions + '/mail/messages.cgi?' + _.plugin.json_to_query(data),
                     function(data) {
                         render(data);
                         loader.end();
                         _.document_title(0, _.lang('titles_mail'));
 
                         // Set received config data
                         config.set(data[0].config);
+
+                        fetching.initial = false;
                     });
             },
 
@@ -2862,6 +2885,7 @@ const mail = (function() {
                         storage.reset();
                     }
                     if (refetch || data.folder_counts_allowed) {
+                        fetching.abort();
                         $.post(_.path.extensions + '/mail/messages.cgi?' + hidden + 'show_body_len=' + preview_length() + '', function(data) {
                             render(data);
                             loader.end();
@@ -2912,6 +2936,7 @@ const mail = (function() {
 
                     // If redirect requested, follow it
                     if (data.redirect) {
+                        fetching.abort();
                         _.pjax.fetch(data.redirect);
                     }
                     return
@@ -3192,7 +3217,7 @@ const mail = (function() {
                 // Update messages, if conditions are met
                 this.refreshTimer = setInterval(() => {
                     let refreshing = () => {
-                        panel.find($$.element('controls.refresh.button')).trigger('click');
+                        !fetching.pending() && panel.find($$.element('controls.refresh.button')).trigger('click');
                     }
                     if (config.d.u) {
                         clearInterval(this.refreshTimer);