Allow aborting of running search requests

pull/171/merge
Aleksander Machniak 11 years ago
parent 2611ac9570
commit d2e3a22d24

@ -576,7 +576,8 @@ function rcube_webmail()
if (obj && obj.blur) if (obj && obj.blur)
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; return false;
// let the browser handle this click (shift/ctrl usually opens the link in a new window/tab) // 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.remove_compose_data(this.env.compose_id);
} }
this.last_command = command;
// process external commands // process external commands
if (typeof this.command_handlers[command] === 'function') { if (typeof this.command_handlers[command] === 'function') {
ret = this.command_handlers[command](props, obj); ret = this.command_handlers[command](props, obj);

Loading…
Cancel
Save