paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

overlays: Rename is_active to any_active.

Browse Source
This commit is contained in:
Aman Agrawal
2023-10-11 09:22:22 +00:00
committed by Tim Abbott
parent 089886245d
commit 2aab74049d
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/hotkey.js
View File

@@ -285,7 +285,7 @@ export function process_escape_key(e) {
return true; return true;
} }
if (overlays.is_active()) { if (overlays.any_active()) {
overlays.close_active(); overlays.close_active();
return true; return true;
} }
@@ -718,7 +718,7 @@ export function process_hotkey(e, hotkey) {
} }
} }
if (hotkey.message_view_only && overlays.is_active()) { if (hotkey.message_view_only && overlays.any_active()) {
if (processing_text()) { if (processing_text()) {
return false; return false;
} }

6
web/src/overlays.ts
View File

@@ -41,7 +41,7 @@ function call_hooks(func_list: Hook[]): void {
} }
} }
export function is_active(): boolean { export function any_active(): boolean {
return Boolean(open_overlay_name); return Boolean(open_overlay_name);
} }
@@ -129,7 +129,7 @@ export function close_overlay(name: string): void {
} }
if (active_overlay === undefined) { if (active_overlay === undefined) {
blueslip.error("close_overlay called without checking is_active()"); blueslip.error("close_overlay called without checking any_active()");
return; return;
} }
@@ -146,7 +146,7 @@ export function close_overlay(name: string): void {
export function close_active(): void { export function close_active(): void {
if (!open_overlay_name) { if (!open_overlay_name) {
blueslip.warn("close_active() called without checking is_active()"); blueslip.warn("close_active() called without checking any_active()");
return; return;
} }

2
web/src/overlays_modals.ts
View File

@@ -2,5 +2,5 @@ import * as modals from "./modals";
import * as overlays from "./overlays"; import * as overlays from "./overlays";
export function any_active(): boolean { export function any_active(): boolean {
return overlays.is_active() || modals.any_active(); return overlays.any_active() || modals.any_active();
} }

6
web/src/user_card_popover.js
View File

@@ -659,7 +659,7 @@ function register_click_handlers() {
const user_id = elem_to_user_id($(e.target).parents("ul")); const user_id = elem_to_user_id($(e.target).parents("ul"));
const email = people.get_by_user_id(user_id).email; const email = people.get_by_user_id(user_id).email;
hide_all(); hide_all();
if (overlays.is_active()) { if (overlays.any_active()) {
overlays.close_active(); overlays.close_active();
} }
narrow.by("dm", email, {trigger: "user sidebar popover"}); narrow.by("dm", email, {trigger: "user sidebar popover"});
@@ -671,7 +671,7 @@ function register_click_handlers() {
const user_id = elem_to_user_id($(e.target).parents("ul")); const user_id = elem_to_user_id($(e.target).parents("ul"));
const email = people.get_by_user_id(user_id).email; const email = people.get_by_user_id(user_id).email;
hide_all(); hide_all();
if (overlays.is_active()) { if (overlays.any_active()) {
overlays.close_active(); overlays.close_active();
} }
narrow.by("sender", email, {trigger: "user sidebar popover"}); narrow.by("sender", email, {trigger: "user sidebar popover"});
@@ -823,7 +823,7 @@ function register_click_handlers() {
private_message_recipient: email, private_message_recipient: email,
}); });
hide_all(); hide_all();
if (overlays.is_active()) { if (overlays.any_active()) {
overlays.close_active(); overlays.close_active();
} }
e.stopPropagation(); e.stopPropagation();

26
web/tests/hotkey.test.js
View File

@@ -60,7 +60,7 @@ const modals = mock_esm("../src/modals", {
active_modal: () => undefined, active_modal: () => undefined,
}); });
const overlays = mock_esm("../src/overlays", { const overlays = mock_esm("../src/overlays", {
is_active: () => false, any_active: () => false,
settings_open: () => false, settings_open: () => false,
streams_open: () => false, streams_open: () => false,
lightbox_open: () => false, lightbox_open: () => false,
@@ -287,14 +287,14 @@ run_test("allow normal typing when processing text", ({override, override_rewire
override_rewire(hotkey, "processing_text", () => true); override_rewire(hotkey, "processing_text", () => true);
let settings_open; let settings_open;
let is_active; let any_active;
let info_overlay_open; let info_overlay_open;
override(overlays, "is_active", () => is_active); override(overlays, "any_active", () => any_active);
override(overlays, "settings_open", () => settings_open); override(overlays, "settings_open", () => settings_open);
override(overlays, "info_overlay_open", () => info_overlay_open); override(overlays, "info_overlay_open", () => info_overlay_open);
for (settings_open of [true, false]) { for (settings_open of [true, false]) {
for (is_active of [true, false]) { for (any_active of [true, false]) {
for (info_overlay_open of [true, false]) { for (info_overlay_open of [true, false]) {
test_normal_typing(); test_normal_typing();
} }
@@ -307,7 +307,7 @@ run_test("streams", ({override}) => {
delete settings_data.user_can_create_public_streams; delete settings_data.user_can_create_public_streams;
delete settings_data.user_can_create_web_public_streams; delete settings_data.user_can_create_web_public_streams;
override(overlays, "streams_open", () => true); override(overlays, "streams_open", () => true);
override(overlays, "is_active", () => true); override(overlays, "any_active", () => true);
assert_mapping("S", stream_settings_ui, "keyboard_sub"); assert_mapping("S", stream_settings_ui, "keyboard_sub");
assert_mapping("V", stream_settings_ui, "view_stream"); assert_mapping("V", stream_settings_ui, "view_stream");
assert_mapping("n", stream_settings_ui, "open_create_stream"); assert_mapping("n", stream_settings_ui, "open_create_stream");
@@ -333,19 +333,19 @@ run_test("basic mappings", () => {
}); });
run_test("drafts open", ({override}) => { run_test("drafts open", ({override}) => {
override(overlays, "is_active", () => true); override(overlays, "any_active", () => true);
override(overlays, "drafts_open", () => true); override(overlays, "drafts_open", () => true);
assert_mapping("d", overlays, "close_overlay"); assert_mapping("d", overlays, "close_overlay");
}); });
run_test("drafts closed w/other overlay", ({override}) => { run_test("drafts closed w/other overlay", ({override}) => {
override(overlays, "is_active", () => true); override(overlays, "any_active", () => true);
override(overlays, "drafts_open", () => false); override(overlays, "drafts_open", () => false);
test_normal_typing(); test_normal_typing();
}); });
run_test("drafts closed launch", ({override}) => { run_test("drafts closed launch", ({override}) => {
override(overlays, "is_active", () => false); override(overlays, "any_active", () => false);
assert_mapping("d", browser_history, "go_to_location"); assert_mapping("d", browser_history, "go_to_location");
}); });
@@ -409,19 +409,19 @@ run_test("misc", ({override}) => {
}); });
run_test("lightbox overlay open", ({override}) => { run_test("lightbox overlay open", ({override}) => {
override(overlays, "is_active", () => true); override(overlays, "any_active", () => true);
override(overlays, "lightbox_open", () => true); override(overlays, "lightbox_open", () => true);
assert_mapping("v", overlays, "close_overlay"); assert_mapping("v", overlays, "close_overlay");
}); });
run_test("lightbox closed w/other overlay open", ({override}) => { run_test("lightbox closed w/other overlay open", ({override}) => {
override(overlays, "is_active", () => true); override(overlays, "any_active", () => true);
override(overlays, "lightbox_open", () => false); override(overlays, "lightbox_open", () => false);
test_normal_typing(); test_normal_typing();
}); });
run_test("v w/no overlays", ({override}) => { run_test("v w/no overlays", ({override}) => {
override(overlays, "is_active", () => false); override(overlays, "any_active", () => false);
assert_mapping("v", lightbox, "show_from_selected_message"); assert_mapping("v", lightbox, "show_from_selected_message");
}); });
@@ -539,10 +539,10 @@ run_test("motion_keys", () => {
assert_unmapped("spacebar"); assert_unmapped("spacebar");
delete overlays.settings_open; delete overlays.settings_open;
delete overlays.is_active; delete overlays.any_active;
overlays.drafts_open = () => true; overlays.drafts_open = () => true;
assert_mapping("up_arrow", drafts_overlay_ui, "handle_keyboard_events"); assert_mapping("up_arrow", drafts_overlay_ui, "handle_keyboard_events");
assert_mapping("down_arrow", drafts_overlay_ui, "handle_keyboard_events"); assert_mapping("down_arrow", drafts_overlay_ui, "handle_keyboard_events");
delete overlays.is_active; delete overlays.any_active;
delete overlays.drafts_open; delete overlays.drafts_open;
}); });