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

settings: Refactor settings_display.js to use settings_object variable.

Browse Source 
This commit changes the settings_display.js code to reference the
user_setings object using settings_object variable. This will help
to easily use the same code for realm-level defaults where instead
of user_settings realm_user_settings_defaults object will be used.
This commit is contained in:
Sahil Batra
2021-08-19 12:57:14 +05:30
committed by Tim Abbott
parent 40f4316972
commit 0c11ced0a0
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
static/js/settings_display.js
View File

@@ -43,21 +43,22 @@ export function set_up() {
const container = $("#user-display-settings"); const container = $("#user-display-settings");
const language_modal_elem = "#user_default_language_modal"; const language_modal_elem = "#user_default_language_modal";
const patch_url = "/json/settings"; const patch_url = "/json/settings";
const settings_object = user_settings;
container.find(".display-settings-status").hide(); container.find(".display-settings-status").hide();
container.find(".setting_demote_inactive_streams").val(user_settings.demote_inactive_streams); container.find(".setting_demote_inactive_streams").val(settings_object.demote_inactive_streams);
container.find(".setting_color_scheme").val(user_settings.color_scheme); container.find(".setting_color_scheme").val(settings_object.color_scheme);
container.find(".setting_default_view").val(user_settings.default_view); container.find(".setting_default_view").val(settings_object.default_view);
container container
.find(".setting_twenty_four_hour_time") .find(".setting_twenty_four_hour_time")
.val(JSON.stringify(user_settings.twenty_four_hour_time)); .val(JSON.stringify(settings_object.twenty_four_hour_time));
container container
.find(`.setting_emojiset_choice[value="${CSS.escape(user_settings.emojiset)}"]`) .find(`.setting_emojiset_choice[value="${CSS.escape(settings_object.emojiset)}"]`)
.prop("checked", true); .prop("checked", true);
$(`${CSS.escape(language_modal_elem)} [data-dismiss]`).on("click", () => { $(`${CSS.escape(language_modal_elem)} [data-dismiss]`).on("click", () => {
@@ -153,7 +154,7 @@ export function set_up() {
container.find(".setting_emojiset_choice").on("click", function () { container.find(".setting_emojiset_choice").on("click", function () {
const data = {emojiset: $(this).val()}; const data = {emojiset: $(this).val()};
const current_emojiset = user_settings.emojiset; const current_emojiset = settings_object.emojiset;
if (current_emojiset === data.emojiset) { if (current_emojiset === data.emojiset) {
return; return;
} }
@@ -188,7 +189,8 @@ export async function report_emojiset_change() {
// implementation is wrong, though, in that it displays the UI // implementation is wrong, though, in that it displays the UI
// update in all active browser windows. // update in all active browser windows.
await emojisets.select(user_settings.emojiset); const settings_object = user_settings;
await emojisets.select(settings_object.emojiset);
const spinner = $("#user-display-settings").find(".emoji-settings-status"); const spinner = $("#user-display-settings").find(".emoji-settings-status");
if (spinner.length) { if (spinner.length) {
@@ -204,14 +206,15 @@ export async function report_emojiset_change() {
export function update_page() { export function update_page() {
const container = $("#user-display-settings"); const container = $("#user-display-settings");
container.find(".left_side_userlist").prop("checked", user_settings.left_side_userlist); const settings_object = user_settings;
container.find(".left_side_userlist").prop("checked", settings_object.left_side_userlist);
container.find(".default_language_name").text(default_language_name); container.find(".default_language_name").text(default_language_name);
container.find(".translate_emoticons").prop("checked", user_settings.translate_emoticons); container.find(".translate_emoticons").prop("checked", settings_object.translate_emoticons);
container container
.find(".setting_twenty_four_hour_time") .find(".setting_twenty_four_hour_time")
.val(JSON.stringify(user_settings.twenty_four_hour_time)); .val(JSON.stringify(settings_object.twenty_four_hour_time));
container.find(".setting_color_scheme").val(JSON.stringify(user_settings.color_scheme)); container.find(".setting_color_scheme").val(JSON.stringify(settings_object.color_scheme));
container.find(".setting_default_view").val(user_settings.default_view); container.find(".setting_default_view").val(settings_object.default_view);
// TODO: Set emoji set selector here. // TODO: Set emoji set selector here.
// Longer term, we'll want to automate this function // Longer term, we'll want to automate this function