paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 18:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

dropdown_widget: Replace widget_id with widget_selector.

Browse Source
This commit is contained in:
Aman Agrawal
2024-02-21 07:18:47 +00:00
committed by Tim Abbott
parent a9dc669f3c
commit 04cf552884
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/src/dropdown_widget.ts
View File

@@ -70,7 +70,7 @@ type DropdownWidgetOptions = {
export class DropdownWidget { export class DropdownWidget {
widget_name: string; widget_name: string;
widget_id: string; widget_selector: string;
widget_wrapper_id: string; widget_wrapper_id: string;
widget_value_selector: string; widget_value_selector: string;
get_options: () => Option[]; get_options: () => Option[];
@@ -98,10 +98,10 @@ export class DropdownWidget {
constructor(options: DropdownWidgetOptions) { constructor(options: DropdownWidgetOptions) {
this.widget_name = options.widget_name; this.widget_name = options.widget_name;
this.widget_id = `#${CSS.escape(this.widget_name)}_widget`; this.widget_selector = `#${CSS.escape(this.widget_name)}_widget`;
// A widget wrapper may not exist based on the UI requirement. // A widget wrapper may not exist based on the UI requirement.
this.widget_wrapper_id = `${this.widget_id}_wrapper`; this.widget_wrapper_id = `${this.widget_selector}_wrapper`;
this.widget_value_selector = `${this.widget_id} .dropdown_widget_value`; this.widget_value_selector = `${this.widget_selector} .dropdown_widget_value`;
this.get_options = options.get_options; this.get_options = options.get_options;
this.item_click_callback = options.item_click_callback; this.item_click_callback = options.item_click_callback;
this.focus_target_on_hidden = options.focus_target_on_hidden ?? true; this.focus_target_on_hidden = options.focus_target_on_hidden ?? true;
@@ -135,10 +135,10 @@ export class DropdownWidget {
this.$events_container.on( this.$events_container.on(
"keydown", "keydown",
`${this.widget_id}, ${this.widget_wrapper_id}`, `${this.widget_selector}, ${this.widget_wrapper_id}`,
(e) => { (e) => {
if (e.key === "Enter") { if (e.key === "Enter") {
$(this.widget_id).trigger("click"); $(this.widget_selector).trigger("click");
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
} }
@@ -149,7 +149,7 @@ export class DropdownWidget {
this.$events_container.addClass("dropdown-widget-disabled-for-spectators"); this.$events_container.addClass("dropdown-widget-disabled-for-spectators");
this.$events_container.on( this.$events_container.on(
"click", "click",
`${this.widget_id}, ${this.widget_wrapper_id}`, `${this.widget_selector}, ${this.widget_wrapper_id}`,
(e) => { (e) => {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
@@ -181,7 +181,7 @@ export class DropdownWidget {
} }
this.instance = tippy.delegate(delegate_container, { this.instance = tippy.delegate(delegate_container, {
...default_popover_props, ...default_popover_props,
target: this.widget_id, target: this.widget_selector,
// Custom theme defined in popovers.css // Custom theme defined in popovers.css
theme: "dropdown-widget", theme: "dropdown-widget",
arrow: false, arrow: false,
@@ -349,7 +349,7 @@ export class DropdownWidget {
}, },
onHidden: (instance: tippy.Instance) => { onHidden: (instance: tippy.Instance) => {
if (this.focus_target_on_hidden) { if (this.focus_target_on_hidden) {
$(this.widget_id).trigger("focus"); $(this.widget_selector).trigger("focus");
} }
this.on_hidden_callback(instance); this.on_hidden_callback(instance);
this.instance = undefined; this.instance = undefined;

2
web/src/user_profile.js
View File

@@ -602,7 +602,7 @@ export function show_edit_bot_info_modal(user_id, $container) {
function item_click_callback(event, dropdown) { function item_click_callback(event, dropdown) {
bot_owner_dropdown_widget.render(); bot_owner_dropdown_widget.render();
// Let dialog_widget know that there was a change in value. // Let dialog_widget know that there was a change in value.
$(bot_owner_dropdown_widget.widget_id).trigger("input"); $(bot_owner_dropdown_widget.widget_selector).trigger("input");
dropdown.hide(); dropdown.hide();
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();