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

subs: Use hash_util to get stream id. 

Active stream's hash look like this - `#streams/1/announce`
Since the stream_id is present where typically hash section
is for all other hashes, get_current_hash_section should return
the same result.
This commit is contained in:
Aman Agrawal 2021-03-15 08:25:22 +00:00 committed by Tim Abbott
parent b180c245b4
commit 570306fa69
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/node_tests/subs.js
View File

@ -15,13 +15,13 @@ const ui = mock_esm("../../static/js/ui", {
get_scroll_element: (element) => element, get_scroll_element: (element) => element,
}); });
set_global("location", {
hash: `#streams/${denmark_stream_id}/announce`,
});
mock_esm("../../static/js/hash_util", { mock_esm("../../static/js/hash_util", {
by_stream_uri: () => {}, by_stream_uri: () => {},
get_current_hash_section: () => denmark_stream_id,
}); });
set_global("page_params", {});
const stream_data = zrequire("stream_data"); const stream_data = zrequire("stream_data");
const subs = zrequire("subs"); const subs = zrequire("subs");

10
static/js/subs.js
View File

@ -116,14 +116,6 @@ export function get_active_data() {
}; };
} }
function get_hash_safe() {
if (typeof window.location.hash === "string") {
return window.location.hash.slice(1);
}
return "";
}
function selectText(element) { function selectText(element) {
let range; let range;
let sel; let sel;
@ -316,7 +308,7 @@ export function update_settings_for_subscribed(sub) {
} }
export function show_active_stream_in_left_panel() { export function show_active_stream_in_left_panel() {
const selected_row = get_hash_safe().split(/\//)[1]; const selected_row = hash_util.get_current_hash_section();
if (Number.parseFloat(selected_row)) { if (Number.parseFloat(selected_row)) {
const sub_row = row_for_stream_id(selected_row); const sub_row = row_for_stream_id(selected_row);