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

settings: Remove settings_org dependency from settings_list_widget.

Browse Source 
Instead of taking a subsection option and calling the settings_org
function to update that subsection, we now take a callback function
as on_update. Also, we now store the value initial value of the
widget in opts.value instead of reading again from page_params.

These changes allow us to use this widget outside of settings_org
and for values other than settings that are in page_params.
This commit is contained in:
Rohitt Vashishtha
2020-04-30 16:39:48 +05:30
committed by Tim Abbott
parent f3ab8e66dc
commit b066ba1ff3
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/settings_list_widget.js
View File

@@ -2,9 +2,11 @@ const DropdownListWidget = function (opts) {
opts = Object.assign({ opts = Object.assign({
null_value: null, null_value: null,
render_text: (item_name) => item_name, render_text: (item_name) => item_name,
on_update: () => {},
}, opts); }, opts);
opts.container_id = `${opts.setting_name}_widget`; opts.container_id = `${opts.setting_name}_widget`;
opts.value_id = `id_${opts.setting_name}`; opts.value_id = `id_${opts.setting_name}`;
opts.value = opts.value || page_params[opts.setting_name];
const render_dropdown_list = require("../templates/settings/dropdown_list.hbs"); const render_dropdown_list = require("../templates/settings/dropdown_list.hbs");
@@ -30,7 +32,7 @@ const DropdownListWidget = function (opts) {
const update = (value) => { const update = (value) => {
render(value); render(value);
settings_org.save_discard_widget_status_handler($(`#org-${opts.subsection}`)); opts.on_update(value);
}; };
const register_event_handlers = () => { const register_event_handlers = () => {
@@ -96,7 +98,7 @@ const DropdownListWidget = function (opts) {
dropdown_toggle.trigger(custom_event); dropdown_toggle.trigger(custom_event);
}); });
render(page_params[opts.setting_name]); render(opts.value);
register_event_handlers(); register_event_handlers();
}; };

8
static/js/settings_org.js
View File

@@ -549,7 +549,9 @@ exports.init_dropdown_widgets = () => {
}; };
return item; return item;
}), }),
subsection: 'notifications', on_update: () => {
exports.save_discard_widget_status_handler($(`#org-notifications`));
},
default_text: i18n.t("Disabled"), default_text: i18n.t("Disabled"),
render_text: (x) => {return `#${x}`;}, render_text: (x) => {return `#${x}`;},
null_value: -1, null_value: -1,
@@ -568,7 +570,9 @@ exports.init_dropdown_widgets = () => {
value: x, value: x,
}; };
}), }),
subsection: 'other-settings', on_update: () => {
exports.save_discard_widget_status_handler($(`#org-other-settings`));
},
default_text: i18n.t("No language set"), default_text: i18n.t("No language set"),
}); });
}; };