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

org settings: Use get_input_element_value in check_property_changed.

Browse Source 
Logic to find the element value was duplicated in check_property_changed,
which can be replaced by `get_input_element_value`.
This commit is contained in:
Pragati Agrawal
2020-05-07 15:15:55 +05:30
committed by Tim Abbott
parent fd9b868635
commit adb41b2e62
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
static/js/settings_org.js
View File

@@ -447,9 +447,10 @@ exports.change_save_button_state = function ($element, state) {
show_hide_element($element, is_show, 800); show_hide_element($element, is_show, 800);
}; };
exports.get_input_element_value = function (input_elem) { exports.get_input_element_value = function (input_elem, input_type) {
input_elem = $(input_elem); input_elem = $(input_elem);
const input_type = input_elem.data("setting-widget-type"); input_type = ["boolean", "string", "number"].includes(input_type)
|| input_elem.data("setting-widget-type");
if (input_type) { if (input_type) {
if (input_type === 'boolean') { if (input_type === 'boolean') {
return input_elem.prop('checked'); return input_elem.prop('checked');
@@ -484,8 +485,8 @@ function get_auth_method_table_data() {
function check_property_changed(elem) { function check_property_changed(elem) {
elem = $(elem); elem = $(elem);
const property_name = exports.extract_property_name(elem); const property_name = exports.extract_property_name(elem);
let changed_val;
let current_val = get_property_value(property_name); let current_val = get_property_value(property_name);
let changed_val;
if (property_name === 'realm_authentication_methods') { if (property_name === 'realm_authentication_methods') {
current_val = sort_object_by_key(current_val); current_val = sort_object_by_key(current_val);
@@ -498,13 +499,8 @@ function check_property_changed(elem) {
changed_val = parseInt(exports.signup_notifications_stream_widget.value(), 10); changed_val = parseInt(exports.signup_notifications_stream_widget.value(), 10);
} else if (property_name === 'realm_default_code_block_language') { } else if (property_name === 'realm_default_code_block_language') {
changed_val = exports.default_code_language_widget.value(); changed_val = exports.default_code_language_widget.value();
} else if (typeof current_val === 'boolean') { } else if (current_val !== undefined) {
changed_val = elem.prop('checked'); changed_val = exports.get_input_element_value(elem, typeof current_val);
} else if (typeof current_val === 'string') {
changed_val = elem.val().trim();
} else if (typeof current_val === 'number') {
current_val = current_val.toString();
changed_val = elem.val().trim();
} else { } else {
blueslip.error('Element refers to unknown property ' + property_name); blueslip.error('Element refers to unknown property ' + property_name);
} }