refs matomo-org#4253 as suggested by dalidev I specified a timeout fo…

…r the autocomplete request (20seconds). If it is not loaded after 20 seconds
sabl0r · May 8, 2014 · e81d7e1 · e81d7e1
1 parent 33a4852
commit e81d7e1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -592,6 +592,15 @@ Segmentation = (function($) {
                     segmentName: segmentName
                 }, 'GET');
                 ajaxHandler.useRegularCallbackInCaseOfError = true;
+                ajaxHandler.setTimeout(20000);
+                ajaxHandler.setErrorCallback(function(response) {
+                    loadingElement.hide();
+                    inputElement.autocomplete({
+                        source: [],
+                        minLength: 0
+                    });
+                    $(inputElement).autocomplete('search', $(inputElement).val());
+                });
                 ajaxHandler.setCallback(function(response) {
                     loadingElement.hide();
 

diff --git a/plugins/Zeitgeist/javascripts/ajaxHelper.js b/plugins/Zeitgeist/javascripts/ajaxHelper.js
@@ -77,6 +77,12 @@ function ajaxHelper() {
      */
     this.async =          true;
 
+    /**
+     * A timeout for the request which will override any global timeout
+     * @type {Boolean}
+     */
+    this.timeout =        null;
+
     /**
      * Callback function to be executed on success
      */
@@ -181,6 +187,16 @@ function ajaxHelper() {
         }, 'post');
     };
 
+    /**
+     * Set a timeout (in milliseconds) for the request. This will override any global timeout.
+     *
+     * @param {integer} timeout  Timeout in milliseconds
+     * @return {void}
+     */
+    this.setTimeout = function (timeout) {
+        this.timeout = timeout;
+    };
+
     /**
      * Sets the callback called after the request finishes
      *
@@ -381,6 +397,10 @@ function ajaxHelper() {
             data:     this._mixinDefaultPostParams(this.postParams)
         };
 
+        if (this.timeout !== null) {
+            ajaxCall.timeout = this.timeout;
+        }
+
         return $.ajax(ajaxCall);
     };