|
|
@ -3434,10 +3434,8 @@ function rcube_webmail()
|
|
|
|
if (this.gui_objects.qsearchbox)
|
|
|
|
if (this.gui_objects.qsearchbox)
|
|
|
|
this.gui_objects.qsearchbox.value = '';
|
|
|
|
this.gui_objects.qsearchbox.value = '';
|
|
|
|
|
|
|
|
|
|
|
|
if (this.env.qsearch) {
|
|
|
|
if (this.env.qsearch)
|
|
|
|
this.set_busy(this.env.qsearch.lock, false);
|
|
|
|
this.abort_request(this.env.qsearch);
|
|
|
|
this.env.qsearch.request.abort();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.env.qsearch = null;
|
|
|
|
this.env.qsearch = null;
|
|
|
|
this.env.search_request = null;
|
|
|
|
this.env.search_request = null;
|
|
|
@ -3760,10 +3758,8 @@ function rcube_webmail()
|
|
|
|
if (!ac)
|
|
|
|
if (!ac)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
for (i=0, len=ac.locks.length; i<len; i++) {
|
|
|
|
for (i=0, len=ac.locks.length; i<len; i++)
|
|
|
|
this.hide_message(ac.locks[i]); // hide loading message
|
|
|
|
this.abort_request({request: ac.requests[i], lock: ac.locks[i]});
|
|
|
|
ac.requests[i].abort(); // abort ajax request
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.ksearch_data = null;
|
|
|
|
this.ksearch_data = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -5664,6 +5660,15 @@ function rcube_webmail()
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 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
|
|
|
|
// handle HTTP response
|
|
|
|
this.http_response = function(response)
|
|
|
|
this.http_response = function(response)
|
|
|
|
{
|
|
|
|
{
|
|
|
|