paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-30 11:33:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

hashchange: Extract func which checks current hash is in RT.

Browse Source
This commit is contained in:
Aman Agrawal
2021-02-17 12:32:58 +00:00
committed by Tim Abbott
parent a210ee2b7d
commit f4f37fca14
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/hotkey.js
View File

@@ -50,7 +50,9 @@ zrequire("common");
const compose_actions = set_global("compose_actions", {}); const compose_actions = set_global("compose_actions", {});
const condense = set_global("condense", {}); const condense = set_global("condense", {});
const drafts = set_global("drafts", {}); const drafts = set_global("drafts", {});
const hashchange = set_global("hashchange", {}); const hashchange = set_global("hashchange", {
in_recent_topics_hash: () => false,
});
set_global("info_overlay", {}); set_global("info_overlay", {});
const lightbox = set_global("lightbox", {}); const lightbox = set_global("lightbox", {});
const list_util = set_global("list_util", {}); const list_util = set_global("list_util", {});

4
static/js/hashchange.js
View File

@@ -44,6 +44,10 @@ function maybe_hide_recent_topics() {
return false; return false;
} }
exports.in_recent_topics_hash = function () {
return ["recent_topics", "#", ""].includes(window.location.hash);
};
exports.changehash = function (newhash) { exports.changehash = function (newhash) {
if (changing_hash) { if (changing_hash) {
return; return;

2
static/js/hotkey.js
View File

@@ -480,7 +480,7 @@ exports.process_hotkey = function (e, hotkey) {
case "open_recent_topics": case "open_recent_topics":
case "escape": case "escape":
if ( if (
["#recent_topics", "#", ""].includes(window.location.hash) && hashchange.in_recent_topics_hash() &&
!popovers.any_active() && !popovers.any_active() &&
!overlays.is_active() && !overlays.is_active() &&
!$("#searchbox_form #search_query").is(":focus") && !$("#searchbox_form #search_query").is(":focus") &&