Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't re-focus on the search box after ending the search. 

(imported from commit 35bffb245ad9dc58b394a1c5228b32db4830f2bd)
This commit is contained in:
Jessica McKellar 2012-11-01 12:14:33 -04:00
parent 9ec6b80019
commit c1cc9f0742
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/jslint/check-all.js
View File

@ -28,6 +28,7 @@ var globals =
// search.js // search.js
+ ' search_button_handler something_is_highlighted update_highlight_on_narrow' + ' search_button_handler something_is_highlighted update_highlight_on_narrow'
+ ' initiate_search'
// setup.js // setup.js
+ ' loading_spinner templates' + ' loading_spinner templates'

2
zephyr/static/js/hotkey.js
View File

@ -114,7 +114,7 @@ function process_hotkey(code) {
respond_to_message("personal"); respond_to_message("personal");
return process_hotkey; return process_hotkey;
case 47: // '/': initiate search case 47: // '/': initiate search
clear_search(); initiate_search();
return process_hotkey; return process_hotkey;
case 63: // '?': Show keyboard shortcuts page case 63: // '?': Show keyboard shortcuts page
$('#keyboard-shortcuts').modal('show'); $('#keyboard-shortcuts').modal('show');

6
zephyr/static/js/search.js
View File

@ -92,9 +92,13 @@ function clear_search_cache() {
cached_term = ""; cached_term = "";
} }
function initiate_search() {
$('#search').val('').focus();
}
function clear_search() { function clear_search() {
$('table tr').removeHighlight(); $('table tr').removeHighlight();
$('#search').val('').focus(); $('#search').val('');
clear_search_cache(); clear_search_cache();
} }