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

js: Convert Object.assign({…}, …) to spread syntax.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-12-21 15:37:36 -08:00
parent 160cc5120a
commit 0c4239e387
7 changed files with 42 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/admin.js
View File

@@ -102,15 +102,14 @@ exports.build_page = function () {
upgrade_text_for_wide_organization_logo:
page_params.upgrade_text_for_wide_organization_logo,
realm_default_external_accounts: page_params.realm_default_external_accounts,
admin_settings_label,
msg_edit_limit_dropdown_values: settings_config.msg_edit_limit_dropdown_values,
msg_delete_limit_dropdown_values: settings_config.msg_delete_limit_dropdown_values,
bot_creation_policy_values: settings_bots.bot_creation_policy_values,
email_address_visibility_values: settings_config.email_address_visibility_values,
...settings_org.get_organization_settings_options(),
};
options.admin_settings_label = admin_settings_label;
options.msg_edit_limit_dropdown_values = settings_config.msg_edit_limit_dropdown_values;
options.msg_delete_limit_dropdown_values = settings_config.msg_delete_limit_dropdown_values;
options.bot_creation_policy_values = settings_bots.bot_creation_policy_values;
options.email_address_visibility_values = settings_config.email_address_visibility_values;
Object.assign(options, settings_org.get_organization_settings_options());
if (options.realm_logo_source !== "D" && options.realm_night_logo_source === "D") {
// If no night mode logo is specified but a day mode one is,
// use the day mode one. See also similar code in realm_logo.js.