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

realm_logo: Rename realm_logo.rerender to realm_logo.render.

Browse Source 
As realm_logo.rerender is now used for initial rendering of
logo as well in c8849f8, so we rename this function from
rerender to render.
This commit is contained in:
sahil839
2021-07-19 17:19:40 +05:30
committed by Tim Abbott
parent dd1fccd2c2
commit 0594207180
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/dispatch.js
View File

@@ -410,7 +410,7 @@ run_test("realm settings", ({override}) => {
assert_same(page_params.realm_icon_url, "icon.png"); assert_same(page_params.realm_icon_url, "icon.png");
assert_same(page_params.realm_icon_source, "U"); assert_same(page_params.realm_icon_source, "U");
override(realm_logo, "rerender", noop); override(realm_logo, "render", noop);
event = event_fixtures.realm__update_dict__logo; event = event_fixtures.realm__update_dict__logo;
dispatch(event); dispatch(event);
@@ -708,7 +708,7 @@ run_test("update_display_settings", ({override}) => {
assert_same(secs, 300); assert_same(secs, 300);
}; };
override(realm_logo, "rerender", noop); override(realm_logo, "render", noop);
{ {
const stub = make_stub(); const stub = make_stub();

2
static/js/realm_logo.js
View File

@@ -63,7 +63,7 @@ function change_logo_delete_button(logo_source, logo_delete_button, file_input)
} }
} }
export function rerender() { export function render() {
const file_input = $("#realm-day-logo-upload-widget .image_file_input"); const file_input = $("#realm-day-logo-upload-widget .image_file_input");
const night_file_input = $("#realm-night-logo-upload-widget .realm-logo-file-input"); const night_file_input = $("#realm-night-logo-upload-widget .realm-logo-file-input");
$("#realm-day-logo-upload-widget .image-block").attr("src", page_params.realm_logo_url); $("#realm-day-logo-upload-widget .image-block").attr("src", page_params.realm_logo_url);

10
static/js/server_events_dispatch.js
View File

@@ -263,12 +263,12 @@ export function dispatch_normal_event(event) {
case "logo": case "logo":
page_params.realm_logo_url = event.data.logo_url; page_params.realm_logo_url = event.data.logo_url;
page_params.realm_logo_source = event.data.logo_source; page_params.realm_logo_source = event.data.logo_source;
realm_logo.rerender(); realm_logo.render();
break; break;
case "night_logo": case "night_logo":
page_params.realm_night_logo_url = event.data.night_logo_url; page_params.realm_night_logo_url = event.data.night_logo_url;
page_params.realm_night_logo_source = event.data.night_logo_source; page_params.realm_night_logo_source = event.data.night_logo_source;
realm_logo.rerender(); realm_logo.render();
break; break;
default: default:
blueslip.error( blueslip.error(
@@ -590,13 +590,13 @@ export function dispatch_normal_event(event) {
setTimeout(() => { setTimeout(() => {
if (event.setting === settings_config.color_scheme_values.night.code) { if (event.setting === settings_config.color_scheme_values.night.code) {
night_mode.enable(); night_mode.enable();
realm_logo.rerender(); realm_logo.render();
} else if (event.setting === settings_config.color_scheme_values.day.code) { } else if (event.setting === settings_config.color_scheme_values.day.code) {
night_mode.disable(); night_mode.disable();
realm_logo.rerender(); realm_logo.render();
} else { } else {
night_mode.default_preference_checker(); night_mode.default_preference_checker();
realm_logo.rerender(); realm_logo.render();
} }
$("body").fadeIn(300); $("body").fadeIn(300);
}, 300); }, 300);

2
static/js/ui_init.js
View File

@@ -509,7 +509,7 @@ export function initialize_everything() {
settings.initialize(); settings.initialize();
compose.initialize(); compose.initialize();
initialize_navbar(); initialize_navbar();
realm_logo.rerender(); realm_logo.render();
message_lists.initialize(); message_lists.initialize();
alert_words.initialize(alert_words_params); alert_words.initialize(alert_words_params);