CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-15 21:03:26 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Make 'narrow to messages containing x' the default.

Browse Source 
As it currently stands, after the introduction of operators, narrowing
to messages that contained X would also trigger a find-in-page.

This stops that from happening, and then also makes the default action
of the search-bar-invoked-without-a-typeahead be 'narrow to messages
containing x' rather than 'find in page'.

(imported from commit 1beffce426c6b00449e7c1c803687a129747ed63)
This commit is contained in:
Waseem Daher 2013-01-31 17:50:39 -05:00
parent 72bc299af2
commit 3e28cbc545
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,14 +83,17 @@ function narrow_or_search_for_term(item) {
// Narrowing will have already put some operators in the search box,
// so leave the current text in.
search_query_box.blur();
return search_query_box.val();
case 'private_message':
narrow.by('pm-with', obj.query.email);
search_query_box.blur();
return search_query_box.val();
case 'operators':
narrow.activate(obj.operators);
search_query_box.blur();
return search_query_box.val();
}
return item;
@ -231,24 +234,17 @@ exports.initialize = function () {
var code = e.which;
var search_query_box = $("#search_query");
if (code === 13 && search_query_box.is(":focus")) {
// We just pressed enter and the box had focus, so one of
// two things is true:
// 1) There's a value in the search box and we should
// search for it
// 2) There's no value in the searchbox, so we just
// narrowed, so we should blur the box.
//
// Note that if the typeahead completion box was up, it
// has already handled the keypress and defocused the
// box. So we only get here when enter was pressed while
// the completion box was not displayed.
// We just pressed enter and the box had focus, which
// means we didn't use the typeahead at all. In that
// case, we should act as though we're searching by
// operators. (The reason the other actions don't call
// this codepath is that they first all blur the box to
// indicate that they've done what they need to do)
if (search_query_box.val()) {
$("#search_up").focus();
exports.search_button_handler(true);
} else {
exports.clear_search();
search_query_box.blur();
narrow.activate(narrow.parse(search_query_box.val()));
}
search_query_box.blur();
update_buttons_with_focus(false);
}
});
};