From d2e3a22d24190c02741e8a67ff1fd8601fe17e07 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 20 Apr 2014 13:39:02 +0200 Subject: Allow aborting of running search requests --- program/js/app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/program/js/app.js b/program/js/app.js index b2ecbae6b..6f61685d1 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -576,7 +576,8 @@ function rcube_webmail() if (obj && obj.blur) obj.blur(); - if (this.busy) + // do nothing if interface is locked by other command (with exception for searching reset) + if (this.busy && !(command == 'reset-search' && this.last_command == 'search')) return false; // let the browser handle this click (shift/ctrl usually opens the link in a new window/tab) @@ -602,6 +603,8 @@ function rcube_webmail() this.remove_compose_data(this.env.compose_id); } + this.last_command = command; + // process external commands if (typeof this.command_handlers[command] === 'function') { ret = this.command_handlers[command](props, obj); -- cgit v1.2.3