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

search: Remove a redundant preventDefault & export is_using_input_method. 

Return false is equivalent to preventDefault and stopPropogation.
is_using_input_method is exported for node testing.
This commit is contained in:
Shubham Dhama 2018-06-22 15:39:09 +05:30 committed by showell
parent 35be5a88ac
commit 42f9ecb841
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
static/js/search.js
View File

@ -2,11 +2,15 @@ var search = (function () {
var exports = {};
var is_using_input_method = false;
// Exported for unit testing
exports.is_using_input_method = false;
function narrow_or_search_for_term(search_string) {
var search_query_box = $("#search_query");
if (is_using_input_method) {
if (exports.is_using_input_method) {
// Neither narrow nor search when using input tools as
// `updater` is also triggered when 'enter' is triggered
// while using input tool
return search_query_box.val();
}
ui_util.change_tab_to('#home');
@ -82,7 +86,7 @@ exports.initialize = function () {
// we suppress searching triggered by this enter key by checking
// `is_using_input_method` before searching.
// More details in the commit message that added this line.
is_using_input_method = true;
exports.is_using_input_method = true;
});
searchbox_form.keydown(function (e) {
@ -92,12 +96,11 @@ exports.initialize = function () {
// Don't submit the form so that the typeahead can instead
// handle our Enter keypress. Any searching that needs
// to be done will be handled in the keyup.
e.preventDefault();
return false;
}
}).keyup(function (e) {
if (is_using_input_method) {
is_using_input_method = false;
if (exports.is_using_input_method) {
exports.is_using_input_method = false;
return;
}
var code = e.which;