Changeset 5021 in subversion

Timestamp:

Aug 4, 2011 4:12:36 AM (22 months ago)

Author:

alec

Message:

• Add abort_request() function

File:

• trunk/roundcubemail/program/js/app.js (modified) (3 diffs)

trunk/roundcubemail/program/js/app.js

@@ -3435 +3435 @@
       this.gui_objects.qsearchbox.value = '';
 
-    if (this.env.qsearch) {
-      this.set_busy(this.env.qsearch.lock, false);
-      this.env.qsearch.request.abort();
-    }
+    if (this.env.qsearch)
+      this.abort_request(this.env.qsearch);
 
     this.env.qsearch = null;
@@ -3761 +3759 @@
       return;
 
-    for (i=0, len=ac.locks.length; i<len; i++) {
-      this.hide_message(ac.locks[i]); // hide loading message
-      ac.requests[i].abort(); // abort ajax request
-    }
+    for (i=0, len=ac.locks.length; i<len; i++)
+      this.abort_request({request: ac.requests[i], lock: ac.locks[i]});
 
     this.ksearch_data = null;
@@ -5665 +5661 @@
   };
 
+  // aborts ajax request
+  this.abort_request = function(r)
+  {
+    if (r.request)
+      r.request.abort();
+    if (r.lock)
+      this.set_busy(r.lock, false);
+  };
+
   // handle HTTP response
   this.http_response = function(response)