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

refactor: Extract do_populate_profile_fields.

Browse Source 
This makes it easier to write tests (since you
can't set meta.loaded to true directly) and
separates out the concern of short-circuiting
updates.
This commit is contained in:
Steve Howell
2018-06-11 19:02:00 +00:00
committed by showell
parent 80a2d5bc59
commit 31a8eca4d0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/settings_profile_fields.js
View File

@@ -168,9 +168,15 @@ exports.reset = function () {
exports.populate_profile_fields = function (profile_fields_data) { exports.populate_profile_fields = function (profile_fields_data) {
if (!meta.loaded) { if (!meta.loaded) {
// If outside callers call us when we're not loaded, just
// exit and we'll draw the widgets again during set_up().
return; return;
} }
exports.do_populate_profile_fields(profile_fields_data);
};
exports.do_populate_profile_fields = function (profile_fields_data) {
// We should only call this internally or from tests.
var profile_fields_table = $("#admin_profile_fields_table").expectOne(); var profile_fields_table = $("#admin_profile_fields_table").expectOne();
profile_fields_table.find("tr.profile-field-row").remove(); // Clear all rows. profile_fields_table.find("tr.profile-field-row").remove(); // Clear all rows.
profile_fields_table.find("tr.profile-field-form").remove(); // Clear all rows. profile_fields_table.find("tr.profile-field-form").remove(); // Clear all rows.
@@ -244,12 +250,12 @@ function set_up_choices_field() {
} }
exports.set_up = function () { exports.set_up = function () {
meta.loaded = true;
// create loading indicators // create loading indicators
loading.make_indicator($('#admin_page_profile_fields_loading_indicator')); loading.make_indicator($('#admin_page_profile_fields_loading_indicator'));
// Populate profile_fields table // Populate profile_fields table
exports.populate_profile_fields(page_params.custom_profile_fields); exports.do_populate_profile_fields(page_params.custom_profile_fields);
meta.loaded = true;
$('#admin_profile_fields_table').on('click', '.delete', delete_profile_field); $('#admin_profile_fields_table').on('click', '.delete', delete_profile_field);
$(".organization").on("submit", "form.admin-profile-field-form", create_profile_field); $(".organization").on("submit", "form.admin-profile-field-form", create_profile_field);