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

settings: Rename settings_display to settings_preferences. 

This commit renames "settings_display.js" file to
"settings_preferences.js".

Fixes part of #26874.
This commit is contained in:
Aditya Kumar Kasaudhan 2024-01-10 01:06:02 +05:30 committed by Tim Abbott
parent 3a12e41c35
commit 49a9954413
10 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/test-js-with-node
View File

@ -200,7 +200,6 @@ EXEMPT_FILES = make_set(
"web/src/settings_account.js", "web/src/settings_account.js",
"web/src/settings_bots.js", "web/src/settings_bots.js",
"web/src/settings_components.js", "web/src/settings_components.js",
"web/src/settings_display.js",
"web/src/settings_emoji.ts", "web/src/settings_emoji.ts",
"web/src/settings_exports.ts", "web/src/settings_exports.ts",
"web/src/settings_invites.ts", "web/src/settings_invites.ts",
@ -210,6 +209,7 @@ EXEMPT_FILES = make_set(
"web/src/settings_org.js", "web/src/settings_org.js",
"web/src/settings_panel_menu.js", "web/src/settings_panel_menu.js",
"web/src/settings_playgrounds.js", "web/src/settings_playgrounds.js",
"web/src/settings_preferences.js",
"web/src/settings_profile_fields.js", "web/src/settings_profile_fields.js",
"web/src/settings_realm_domains.ts", "web/src/settings_realm_domains.ts",
"web/src/settings_realm_user_settings_defaults.js", "web/src/settings_realm_user_settings_defaults.js",

4
web/src/click_handlers.js
View File

@ -28,8 +28,8 @@ import * as reactions from "./reactions";
import * as recent_view_ui from "./recent_view_ui"; import * as recent_view_ui from "./recent_view_ui";
import * as rows from "./rows"; import * as rows from "./rows";
import * as server_events from "./server_events"; import * as server_events from "./server_events";
import * as settings_display from "./settings_display";
import * as settings_panel_menu from "./settings_panel_menu"; import * as settings_panel_menu from "./settings_panel_menu";
import * as settings_preferences from "./settings_preferences";
import * as settings_toggle from "./settings_toggle"; import * as settings_toggle from "./settings_toggle";
import * as sidebar_ui from "./sidebar_ui"; import * as sidebar_ui from "./sidebar_ui";
import * as spectators from "./spectators"; import * as spectators from "./spectators";
@ -783,7 +783,7 @@ export function initialize() {
$("body").on("click", ".language_selection_widget button", (e) => { $("body").on("click", ".language_selection_widget button", (e) => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
settings_display.launch_default_language_setting_modal(); settings_preferences.launch_default_language_setting_modal();
}); });
$("body").on("click", "#header-container .brand", (e) => { $("body").on("click", "#header-container .brand", (e) => {

4
web/src/gear_menu.js
View File

@ -10,7 +10,7 @@ import * as message_lists from "./message_lists";
import * as popover_menus from "./popover_menus"; import * as popover_menus from "./popover_menus";
import * as popover_menus_data from "./popover_menus_data"; import * as popover_menus_data from "./popover_menus_data";
import * as popovers from "./popovers"; import * as popovers from "./popovers";
import * as settings_display from "./settings_display"; import * as settings_preferences from "./settings_preferences";
import {parse_html} from "./ui_util"; import {parse_html} from "./ui_util";
/* /*
@ -154,7 +154,7 @@ export function initialize() {
instance.hide(); instance.hide();
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
settings_display.launch_default_language_setting_modal(); settings_preferences.launch_default_language_setting_modal();
}); });
// We cannot update recipient bar color using dark_theme.enable/disable due to // We cannot update recipient bar color using dark_theme.enable/disable due to

15
web/src/server_events_dispatch.js
View File

@ -51,7 +51,6 @@ import * as scroll_bar from "./scroll_bar";
import * as settings_account from "./settings_account"; import * as settings_account from "./settings_account";
import * as settings_bots from "./settings_bots"; import * as settings_bots from "./settings_bots";
import * as settings_config from "./settings_config"; import * as settings_config from "./settings_config";
import * as settings_display from "./settings_display";
import * as settings_emoji from "./settings_emoji"; import * as settings_emoji from "./settings_emoji";
import * as settings_exports from "./settings_exports"; import * as settings_exports from "./settings_exports";
import * as settings_invites from "./settings_invites"; import * as settings_invites from "./settings_invites";
@ -59,6 +58,7 @@ import * as settings_linkifiers from "./settings_linkifiers";
import * as settings_notifications from "./settings_notifications"; import * as settings_notifications from "./settings_notifications";
import * as settings_org from "./settings_org"; import * as settings_org from "./settings_org";
import * as settings_playgrounds from "./settings_playgrounds"; import * as settings_playgrounds from "./settings_playgrounds";
import * as settings_preferences from "./settings_preferences";
import * as settings_profile_fields from "./settings_profile_fields"; import * as settings_profile_fields from "./settings_profile_fields";
import * as settings_realm_domains from "./settings_realm_domains"; import * as settings_realm_domains from "./settings_realm_domains";
import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults"; import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults";
@ -716,7 +716,7 @@ export function dispatch_normal_event(event) {
// a reload is fundamentally required because we // a reload is fundamentally required because we
// cannot rerender with the new language the strings // cannot rerender with the new language the strings
// present in the backend/Jinja2 templates. // present in the backend/Jinja2 templates.
settings_display.set_default_language_name(event.language_name); settings_preferences.set_default_language_name(event.language_name);
} }
if (event.property === "web_home_view") { if (event.property === "web_home_view") {
left_sidebar_navigation_area.handle_home_view_changed(event.value); left_sidebar_navigation_area.handle_home_view_changed(event.value);
@ -750,8 +750,8 @@ export function dispatch_normal_event(event) {
stream_list.update_dom_unread_counts_visibility(); stream_list.update_dom_unread_counts_visibility();
} }
if (event.property === "user_list_style") { if (event.property === "user_list_style") {
settings_display.report_user_list_style_change( settings_preferences.report_user_list_style_change(
settings_display.user_settings_panel, settings_preferences.user_settings_panel,
); );
activity_ui.build_user_sidebar(); activity_ui.build_user_sidebar();
} }
@ -791,8 +791,9 @@ export function dispatch_normal_event(event) {
// reload. // reload.
} }
if (event.property === "emojiset") { if (event.property === "emojiset") {
settings_display.report_emojiset_change(settings_display.user_settings_panel); settings_preferences.report_emojiset_change(
settings_preferences.user_settings_panel,
);
// Rerender the whole message list UI // Rerender the whole message list UI
for (const msg_list of message_lists.all_rendered_message_lists()) { for (const msg_list of message_lists.all_rendered_message_lists()) {
msg_list.rerender(); msg_list.rerender();
@ -824,7 +825,7 @@ export function dispatch_normal_event(event) {
$("#user_email_address_visibility").val(event.value); $("#user_email_address_visibility").val(event.value);
break; break;
} }
settings_display.update_page(event.property); settings_preferences.update_page(event.property);
break; break;
} }

4
web/src/settings.js
View File

@ -15,8 +15,8 @@ import * as people from "./people";
import * as settings_bots from "./settings_bots"; import * as settings_bots from "./settings_bots";
import * as settings_config from "./settings_config"; import * as settings_config from "./settings_config";
import * as settings_data from "./settings_data"; import * as settings_data from "./settings_data";
import * as settings_display from "./settings_display";
import * as settings_panel_menu from "./settings_panel_menu"; import * as settings_panel_menu from "./settings_panel_menu";
import * as settings_preferences from "./settings_preferences";
import * as settings_sections from "./settings_sections"; import * as settings_sections from "./settings_sections";
import * as settings_toggle from "./settings_toggle"; import * as settings_toggle from "./settings_toggle";
import * as timerender from "./timerender"; import * as timerender from "./timerender";
@ -139,7 +139,7 @@ export function build_page() {
user_can_change_avatar: settings_data.user_can_change_avatar(), user_can_change_avatar: settings_data.user_can_change_avatar(),
user_can_change_email: settings_data.user_can_change_email(), user_can_change_email: settings_data.user_can_change_email(),
user_role_text: people.get_user_type(page_params.user_id), user_role_text: people.get_user_type(page_params.user_id),
default_language_name: settings_display.user_default_language_name, default_language_name: settings_preferences.user_default_language_name,
default_language: user_settings.default_language, default_language: user_settings.default_language,
realm_push_notifications_enabled: page_params.realm_push_notifications_enabled, realm_push_notifications_enabled: page_params.realm_push_notifications_enabled,
settings_object: user_settings, settings_object: user_settings,

0
web/src/settings_display.js → web/src/settings_preferences.js
View File

4
web/src/settings_realm_user_settings_defaults.js
View File

@ -5,9 +5,9 @@ import * as overlays from "./overlays";
import {page_params} from "./page_params"; import {page_params} from "./page_params";
import {realm_user_settings_defaults} from "./realm_user_settings_defaults"; import {realm_user_settings_defaults} from "./realm_user_settings_defaults";
import * as settings_components from "./settings_components"; import * as settings_components from "./settings_components";
import * as settings_display from "./settings_display";
import * as settings_notifications from "./settings_notifications"; import * as settings_notifications from "./settings_notifications";
import * as settings_org from "./settings_org"; import * as settings_org from "./settings_org";
import * as settings_preferences from "./settings_preferences";
export const realm_default_settings_panel = {}; export const realm_default_settings_panel = {};
@ -58,7 +58,7 @@ export function set_up() {
const $notification_sound_elem = $("audio#realm-default-notification-sound-audio"); const $notification_sound_elem = $("audio#realm-default-notification-sound-audio");
const $notification_sound_dropdown = $container.find(".setting_notification_sound"); const $notification_sound_dropdown = $container.find(".setting_notification_sound");
settings_display.set_up(realm_default_settings_panel); settings_preferences.set_up(realm_default_settings_panel);
audible_notifications.update_notification_sound_source( audible_notifications.update_notification_sound_source(
$notification_sound_elem, $notification_sound_elem,

4
web/src/settings_sections.js
View File

@ -3,7 +3,6 @@ import * as attachments_ui from "./attachments_ui";
import * as blueslip from "./blueslip"; import * as blueslip from "./blueslip";
import * as settings_account from "./settings_account"; import * as settings_account from "./settings_account";
import * as settings_bots from "./settings_bots"; import * as settings_bots from "./settings_bots";
import * as settings_display from "./settings_display";
import * as settings_emoji from "./settings_emoji"; import * as settings_emoji from "./settings_emoji";
import * as settings_exports from "./settings_exports"; import * as settings_exports from "./settings_exports";
import * as settings_invites from "./settings_invites"; import * as settings_invites from "./settings_invites";
@ -12,6 +11,7 @@ import * as settings_muted_users from "./settings_muted_users";
import * as settings_notifications from "./settings_notifications"; import * as settings_notifications from "./settings_notifications";
import * as settings_org from "./settings_org"; import * as settings_org from "./settings_org";
import * as settings_playgrounds from "./settings_playgrounds"; import * as settings_playgrounds from "./settings_playgrounds";
import * as settings_preferences from "./settings_preferences";
import * as settings_profile_fields from "./settings_profile_fields"; import * as settings_profile_fields from "./settings_profile_fields";
import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults"; import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults";
import * as settings_streams from "./settings_streams"; import * as settings_streams from "./settings_streams";
@ -51,7 +51,7 @@ export function initialize() {
// personal // personal
load_func_dict.set("your-account", settings_account.set_up); load_func_dict.set("your-account", settings_account.set_up);
load_func_dict.set("preferences", () => { load_func_dict.set("preferences", () => {
settings_display.set_up(settings_display.user_settings_panel); settings_preferences.set_up(settings_preferences.user_settings_panel);
}); });
load_func_dict.set("notifications", () => { load_func_dict.set("notifications", () => {
settings_notifications.set_up(settings_notifications.user_settings_panel); settings_notifications.set_up(settings_notifications.user_settings_panel);

4
web/src/ui_init.js
View File

@ -102,9 +102,9 @@ import * as search from "./search";
import * as server_events from "./server_events"; import * as server_events from "./server_events";
import * as settings from "./settings"; import * as settings from "./settings";
import * as settings_data from "./settings_data"; import * as settings_data from "./settings_data";
import * as settings_display from "./settings_display";
import * as settings_notifications from "./settings_notifications"; import * as settings_notifications from "./settings_notifications";
import * as settings_panel_menu from "./settings_panel_menu"; import * as settings_panel_menu from "./settings_panel_menu";
import * as settings_preferences from "./settings_preferences";
import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults"; import * as settings_realm_user_settings_defaults from "./settings_realm_user_settings_defaults";
import * as settings_sections from "./settings_sections"; import * as settings_sections from "./settings_sections";
import * as settings_toggle from "./settings_toggle"; import * as settings_toggle from "./settings_toggle";
@ -655,7 +655,7 @@ export function initialize_everything() {
navbar_help_menu.initialize(); navbar_help_menu.initialize();
giphy.initialize(); giphy.initialize();
presence.initialize(presence_params); presence.initialize(presence_params);
settings_display.initialize(); settings_preferences.initialize();
settings_notifications.initialize(); settings_notifications.initialize();
settings_realm_user_settings_defaults.initialize(); settings_realm_user_settings_defaults.initialize();
settings_panel_menu.initialize(); settings_panel_menu.initialize();

10
web/tests/dispatch.test.js
View File

@ -47,7 +47,6 @@ const scheduled_messages_ui = mock_esm("../src/scheduled_messages_ui");
const scroll_bar = mock_esm("../src/scroll_bar"); const scroll_bar = mock_esm("../src/scroll_bar");
const settings_account = mock_esm("../src/settings_account"); const settings_account = mock_esm("../src/settings_account");
const settings_bots = mock_esm("../src/settings_bots"); const settings_bots = mock_esm("../src/settings_bots");
const settings_display = mock_esm("../src/settings_display");
const settings_emoji = mock_esm("../src/settings_emoji"); const settings_emoji = mock_esm("../src/settings_emoji");
const settings_exports = mock_esm("../src/settings_exports"); const settings_exports = mock_esm("../src/settings_exports");
const settings_invites = mock_esm("../src/settings_invites"); const settings_invites = mock_esm("../src/settings_invites");
@ -56,6 +55,7 @@ const settings_playgrounds = mock_esm("../src/settings_playgrounds");
const settings_notifications = mock_esm("../src/settings_notifications"); const settings_notifications = mock_esm("../src/settings_notifications");
const settings_org = mock_esm("../src/settings_org"); const settings_org = mock_esm("../src/settings_org");
const settings_profile_fields = mock_esm("../src/settings_profile_fields"); const settings_profile_fields = mock_esm("../src/settings_profile_fields");
const settings_preferences = mock_esm("../src/settings_preferences");
const settings_realm_user_settings_defaults = mock_esm( const settings_realm_user_settings_defaults = mock_esm(
"../src/settings_realm_user_settings_defaults", "../src/settings_realm_user_settings_defaults",
); );
@ -832,10 +832,10 @@ run_test("stream_typing", ({override}) => {
}); });
run_test("user_settings", ({override}) => { run_test("user_settings", ({override}) => {
settings_display.set_default_language_name = noop; settings_preferences.set_default_language_name = () => {};
let event = event_fixtures.user_settings__default_language; let event = event_fixtures.user_settings__default_language;
user_settings.default_language = "en"; user_settings.default_language = "en";
override(settings_display, "update_page", noop); override(settings_preferences, "update_page", noop);
override(overlays, "settings_open", () => true); override(overlays, "settings_open", () => true);
dispatch(event); dispatch(event);
assert_same(user_settings.default_language, "fr"); assert_same(user_settings.default_language, "fr");
@ -952,7 +952,7 @@ run_test("user_settings", ({override}) => {
const stub = make_stub(); const stub = make_stub();
event = event_fixtures.user_settings__emojiset; event = event_fixtures.user_settings__emojiset;
called = false; called = false;
override(settings_display, "report_emojiset_change", stub.f); override(settings_preferences, "report_emojiset_change", stub.f);
override(activity_ui, "build_user_sidebar", noop); override(activity_ui, "build_user_sidebar", noop);
user_settings.emojiset = "text"; user_settings.emojiset = "text";
dispatch(event); dispatch(event);
@ -996,7 +996,7 @@ run_test("user_settings", ({override}) => {
{ {
const stub = make_stub(); const stub = make_stub();
event = event_fixtures.user_settings__user_list_style; event = event_fixtures.user_settings__user_list_style;
override(settings_display, "report_user_list_style_change", stub.f); override(settings_preferences, "report_user_list_style_change", stub.f);
user_settings.user_list_style = 1; user_settings.user_list_style = 1;
override(activity_ui, "build_user_sidebar", stub.f); override(activity_ui, "build_user_sidebar", stub.f);
dispatch(event); dispatch(event);