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

org_settings: Refactor build_realm_logo_widget function.

Browse Source 
This commit deduplicates the code for `build_realm_logo_widget` and
`build_realm_night_logo_widget`. It deduplicates the common code for
`build_realm_day_mode_logo_widget` & `build_realm_night_mode_logo_widget`
into tthe function `build_realm_logo_widget`.
This commit is contained in:
Pragati Agrawal
2019-02-27 20:15:26 +05:30
committed by Tim Abbott
parent 1b065d811a
commit bf1c9420df
3 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/settings_org.js
View File

@@ -56,8 +56,8 @@ const _ui_report = {
}; };
const _realm_logo = { const _realm_logo = {
build_realm_logo_widget: noop, build_realm_day_mode_logo_widget: noop,
build_realm_night_logo_widget: noop, build_realm_night_mode_logo_widget: noop,
}; };
set_global('channel', _channel); set_global('channel', _channel);

68
static/js/realm_logo.js
View File

@@ -1,18 +1,20 @@
/* eslint indent: "off" */ /* eslint indent: "off" */
var realm_logo = (function () { var realm_logo = (function () {
var exports = {}; var exports = {};
exports.build_realm_logo_widget = function (upload_function) {
function build_realm_logo_widget(args) {
var get_file_input = function () { var get_file_input = function () {
return $('#realm_logo_file_input').expectOne(); return args.file_input_elem.expectOne();
}; };
if (page_params.realm_logo_source === 'D') { if (page_params.realm_logo_source === 'D') {
$("#realm_logo_delete_button").hide(); args.delete_button_elem.hide();
} else { } else {
$("#realm_logo_delete_button").show(); args.delete_button_elem.show();
} }
var data = {night: JSON.stringify(false)};
$("#realm_logo_delete_button").on('click', function (e) { var data = {night: JSON.stringify(args.is_night_mode)};
args.delete_button_elem.on('click', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
channel.del({ channel.del({
@@ -23,39 +25,35 @@ var realm_logo = (function () {
return upload_widget.build_direct_upload_widget( return upload_widget.build_direct_upload_widget(
get_file_input, get_file_input,
$("#realm_logo_file_input_error").expectOne(), args.file_input_error_elem.expectOne(),
$("#realm_logo_upload_button").expectOne(), args.upload_button_elem.expectOne(),
upload_function, args.upload_function,
page_params.max_logo_file_size page_params.max_logo_file_size
); );
}
exports.build_realm_day_mode_logo_widget = function (upload_function) {
var args = {
delete_button_elem: $("#realm_logo_delete_button"),
file_input_elem: $('#realm_logo_file_input'),
file_input_error_elem: $("#realm_logo_file_input_error"),
is_night_mode: false,
upload_button_elem: $("#realm_logo_upload_button"),
upload_function: upload_function,
};
return build_realm_logo_widget(args);
}; };
exports.build_realm_night_logo_widget = function (upload_function) { exports.build_realm_night_mode_logo_widget = function (upload_function) {
var get_file_input = function () { var args = {
return $('#realm_night_logo_file_input').expectOne(); delete_button_elem: $("#realm_night_logo_delete_button"),
file_input_elem: $('#realm_night_logo_file_input'),
file_input_error_elem: $("#realm_night_logo_file_input_error"),
is_night_mode: true,
upload_button_elem: $("#realm_night_logo_upload_button"),
upload_function: upload_function,
}; };
if (page_params.realm_night_logo_source === 'D') { return build_realm_logo_widget(args);
$("#realm_night_logo_delete_button").hide();
} else {
$("#realm_night_logo_delete_button").show();
}
var data = {night: JSON.stringify(true)};
$("#realm_night_logo_delete_button").on('click', function (e) {
e.preventDefault();
e.stopPropagation();
channel.del({
url: '/json/realm/logo',
data: data,
});
});
return upload_widget.build_direct_upload_widget(
get_file_input,
$("#realm_night_logo_file_input_error").expectOne(),
$("#realm_night_logo_upload_button").expectOne(),
upload_function,
page_params.max_logo_file_size
);
}; };
exports.rerender = function () { exports.rerender = function () {

6
static/js/settings_org.js
View File

@@ -1154,10 +1154,10 @@ exports.build_page = function () {
ui_report.error("", xhr, error_field); ui_report.error("", xhr, error_field);
}, },
}); });
} }
realm_logo.build_realm_night_logo_widget(upload_realm_logo);
realm_logo.build_realm_logo_widget(upload_realm_logo); realm_logo.build_realm_day_mode_logo_widget(upload_realm_logo);
realm_logo.build_realm_night_mode_logo_widget(upload_realm_logo);
$('#deactivate_realm_button').on('click', function (e) { $('#deactivate_realm_button').on('click', function (e) {
if (!overlays.is_modal_open()) { if (!overlays.is_modal_open()) {