Un-narrow whenever we clear the search box

(imported from commit 15533579bfbae1644cc76b33348c3cd21a829713)
This commit is contained in:
Keegan McAllister 2012-12-18 15:45:48 -05:00
parent 4ddaf5a2ae
commit ddf75b64f7
2 changed files with 2 additions and 3 deletions

View File

@ -107,10 +107,8 @@ function process_hotkey(e) {
ui.hide_userinfo_popover();
} else if (compose.composing()) {
compose.cancel();
} else if (search.keyboard_currently_finding()) {
search.clear_search();
} else {
narrow.deactivate();
search.clear_search();
}
return true;
case 99: // 'c': compose

View File

@ -337,6 +337,7 @@ exports.initiate_search = function () {
};
exports.clear_search = function () {
narrow.deactivate();
$('table tr').removeHighlight();
// Clear & reset searchbox to its normal size
$('#search_query').val('').width('');