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

js: Automatically convert var to let and const in most files.

Browse Source 
This commit was originally automatically generated using `tools/lint
--only=eslint --fix`.  It was then modified by tabbott to contain only
changes to a set of files that are unlikely to result in significant
merge conflicts with any open pull request, excluding about 20 files.
His plan is to merge the remaining changes with more precise care,
potentially involving merging parts of conflicting pull requests
before running the `eslint --fix` operation.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2019-11-01 16:06:25 -07:00
committed by Tim Abbott
parent f7245e9ec6
commit 28f3dfa284
279 changed files with 6102 additions and 6102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
static/js/settings_users.js
View File

@@ -1,8 +1,8 @@
var render_admin_user_list = require("../templates/admin_user_list.hbs");
var render_bot_owner_select = require("../templates/bot_owner_select.hbs");
var render_user_info_form_modal = require('../templates/user_info_form_modal.hbs');
const render_admin_user_list = require("../templates/admin_user_list.hbs");
const render_bot_owner_select = require("../templates/bot_owner_select.hbs");
const render_user_info_form_modal = require('../templates/user_info_form_modal.hbs');
var meta = {
const meta = {
loaded: false,
};
@@ -24,8 +24,8 @@ function get_user_info_row(user_id) {
}
function update_view_on_deactivate(row) {
var button = row.find("button.deactivate");
var user_role = row.find(".user_role");
const button = row.find("button.deactivate");
const user_role = row.find(".user_role");
button.prop("disabled", false);
row.find('button.open-user-form').hide();
row.find('i.deactivated-user-icon').show();
@@ -35,15 +35,15 @@ function update_view_on_deactivate(row) {
row.addClass("deactivated_user");
if (user_role) {
var user_id = row.data('user-id');
const user_id = row.data('user-id');
user_role.text("%state (%role)".replace("%state", i18n.t("Deactivated")).
replace("%role", people.get_user_type(user_id)));
}
}
function update_view_on_reactivate(row) {
var button = row.find("button.reactivate");
var user_role = row.find(".user_role");
const button = row.find("button.reactivate");
const user_role = row.find(".user_role");
row.find("button.open-user-form").show();
row.find('i.deactivated-user-icon').hide();
button.addClass("btn-danger deactivate");
@@ -52,13 +52,13 @@ function update_view_on_reactivate(row) {
row.removeClass("deactivated_user");
if (user_role) {
var user_id = row.data('user-id');
const user_id = row.data('user-id');
user_role.text(people.get_user_type(user_id));
}
}
function get_status_field() {
var current_tab = settings_panel_menu.org_settings.current_tab();
const current_tab = settings_panel_menu.org_settings.current_tab();
switch (current_tab) {
case 'deactivated-users-admin':
return $("#deactivated-user-field-status").expectOne();
@@ -77,7 +77,7 @@ exports.update_user_data = function (user_id, new_data) {
return;
}
var user_row = get_user_info_row(user_id);
const user_row = get_user_info_row(user_id);
if (new_data.full_name !== undefined) {
// Update the full name in the table
@@ -106,15 +106,15 @@ exports.update_user_data = function (user_id, new_data) {
function failed_listing_users(xhr) {
loading.destroy_indicator($('#subs_page_loading_indicator'));
var status = get_status_field();
const status = get_status_field();
ui_report.error(i18n.t("Error listing users or bots"), xhr, status);
}
var LAST_ACTIVE_NEVER = -1;
var LAST_ACTIVE_UNKNOWN = -2;
const LAST_ACTIVE_NEVER = -1;
const LAST_ACTIVE_UNKNOWN = -2;
function get_last_active(user) {
var presence_info = presence.presence_info[user.user_id];
const presence_info = presence.presence_info[user.user_id];
if (!presence_info) {
return LAST_ACTIVE_UNKNOWN;
}
@@ -125,9 +125,9 @@ function get_last_active(user) {
}
function populate_users(realm_people_data) {
var active_users = [];
var deactivated_users = [];
var bots = [];
let active_users = [];
let deactivated_users = [];
let bots = [];
_.each(realm_people_data.members, function (user) {
user.is_active_human = user.is_active && !user.is_bot;
if (user.is_bot) {
@@ -146,14 +146,14 @@ function populate_users(realm_people_data) {
deactivated_users = _.sortBy(deactivated_users, 'full_name');
bots = _.sortBy(bots, 'full_name');
var reset_scrollbar = function ($sel) {
const reset_scrollbar = function ($sel) {
return function () {
ui.reset_scrollbar($sel);
};
};
var $bots_table = $("#admin_bots_table");
var bot_list = list_render.create($bots_table, bots, {
const $bots_table = $("#admin_bots_table");
const bot_list = list_render.create($bots_table, bots, {
name: "admin_bot_list",
modifier: function (item) {
return render_admin_user_list({
@@ -186,7 +186,7 @@ function populate_users(realm_people_data) {
});
function get_rendered_last_activity(item) {
var today = new XDate();
const today = new XDate();
if (item.last_active === LAST_ACTIVE_UNKNOWN) {
return $("<span></span>").text(i18n.t("Unknown"));
}
@@ -197,11 +197,11 @@ function populate_users(realm_people_data) {
new XDate(item.last_active * 1000), undefined, today);
}
var $users_table = $("#admin_users_table");
var users_list = list_render.create($users_table, active_users, {
const $users_table = $("#admin_users_table");
const users_list = list_render.create($users_table, active_users, {
name: "users_table_list",
modifier: function (item) {
var $row = $(render_admin_user_list({
const $row = $(render_admin_user_list({
can_modify: page_params.is_admin,
is_current_user: people.is_my_user_id(item.user_id),
show_email: settings_org.show_email(),
@@ -213,7 +213,7 @@ function populate_users(realm_people_data) {
filter: {
element: $users_table.closest(".settings-section").find(".search"),
callback: function (item, value) {
var email = item.email;
let email = item.email;
if (page_params.is_admin) {
email = item.delivery_email;
}
@@ -244,8 +244,8 @@ function populate_users(realm_people_data) {
return compare_a_b(b.last_active, a.last_active);
});
var $deactivated_users_table = $("#admin_deactivated_users_table");
var deactivated_users_list = list_render.create($deactivated_users_table, deactivated_users, {
const $deactivated_users_table = $("#admin_deactivated_users_table");
const deactivated_users_list = list_render.create($deactivated_users_table, deactivated_users, {
name: "deactivated_users_table_list",
modifier: function (item) {
return render_admin_user_list({
@@ -257,7 +257,7 @@ function populate_users(realm_people_data) {
filter: {
element: $deactivated_users_table.closest(".settings-section").find(".search"),
callback: function (item, value) {
var email = item.email;
let email = item.email;
if (page_params.is_admin) {
email = item.delivery_email;
}
@@ -302,7 +302,7 @@ exports.set_up = function () {
};
function open_user_info_form_modal(person) {
var html = render_user_info_form_modal({
const html = render_user_info_form_modal({
user_id: person.user_id,
email: person.email,
full_name: people.get_full_name(person.user_id),
@@ -311,16 +311,16 @@ function open_user_info_form_modal(person) {
is_member: !person.is_admin && !person.is_guest,
is_bot: person.is_bot,
});
var user_info_form_modal = $(html);
var modal_container = $('#user-info-form-modal-container');
const user_info_form_modal = $(html);
const modal_container = $('#user-info-form-modal-container');
modal_container.empty().append(user_info_form_modal);
overlays.open_modal('user-info-form-modal');
if (person.is_bot) {
// Dynamically add the owner select control in order to
// avoid performance issues in case of large number of users.
var users_list = people.get_active_human_persons();
var owner_select = $(render_bot_owner_select({users_list: users_list}));
const users_list = people.get_active_human_persons();
const owner_select = $(render_bot_owner_select({users_list: users_list}));
owner_select.val(bot_data.get(person.user_id).owner || "");
modal_container.find(".edit_bot_owner_container").append(owner_select);
}
@@ -333,7 +333,7 @@ exports.on_load_success = function (realm_people_data) {
populate_users(realm_people_data);
var modal_elem = $("#deactivation_user_modal").expectOne();
const modal_elem = $("#deactivation_user_modal").expectOne();
$(".admin_user_table").on("click", ".deactivate", function (e) {
// This click event must not get propagated to parent container otherwise the modal
@@ -341,9 +341,9 @@ exports.on_load_success = function (realm_people_data) {
e.preventDefault();
e.stopPropagation();
var row = $(e.target).closest(".user_row");
var user_id = row.data('user-id');
var user = people.get_person_from_user_id(user_id);
const row = $(e.target).closest(".user_row");
const user_id = row.data('user-id');
const user = people.get_person_from_user_id(user_id);
modal_elem.find(".email").text(user.email);
modal_elem.find(".user_name").text(user.full_name);
modal_elem.modal("show");
@@ -351,9 +351,9 @@ exports.on_load_success = function (realm_people_data) {
});
modal_elem.find('.do_deactivate_button').click(function () {
var user_id = modal_elem.data('user-id');
var row = get_user_info_row(user_id);
var email = row.attr("data-email");
const user_id = modal_elem.data('user-id');
const row = get_user_info_row(user_id);
const email = row.attr("data-email");
if ($("#deactivation_user_modal .email").html() !== email) {
blueslip.error("User deactivation canceled due to non-matching fields.");
@@ -361,9 +361,9 @@ exports.on_load_success = function (realm_people_data) {
$("#home-error"), 'alert-error');
}
modal_elem.modal("hide");
var row_deactivate_button = row.find("button.deactivate");
const row_deactivate_button = row.find("button.deactivate");
row_deactivate_button.prop("disabled", true).text(i18n.t("Working…"));
var opts = {
const opts = {
success_continuation: function () {
update_view_on_deactivate(row);
},
@@ -371,8 +371,8 @@ exports.on_load_success = function (realm_people_data) {
row_deactivate_button.text(i18n.t("Deactivate"));
},
};
var status = get_status_field();
var url = '/json/users/' + encodeURIComponent(user_id);
const status = get_status_field();
const url = '/json/users/' + encodeURIComponent(user_id);
settings_ui.do_settings_change(channel.del, url, {}, status, opts);
});
@@ -381,12 +381,12 @@ exports.on_load_success = function (realm_people_data) {
e.preventDefault();
e.stopPropagation();
var button_elem = $(e.target);
var row = button_elem.closest(".user_row");
var bot_id = row.attr("data-user-id");
var url = '/json/bots/' + encodeURIComponent(bot_id);
const button_elem = $(e.target);
const row = button_elem.closest(".user_row");
const bot_id = row.attr("data-user-id");
const url = '/json/bots/' + encodeURIComponent(bot_id);
var opts = {
const opts = {
success_continuation: function () {
update_view_on_deactivate(row);
},
@@ -394,7 +394,7 @@ exports.on_load_success = function (realm_people_data) {
ui_report.generic_row_button_error(xhr, button_elem);
},
};
var status = get_status_field();
const status = get_status_field();
settings_ui.do_settings_change(channel.del, url, {}, status, opts);
});
@@ -403,14 +403,14 @@ exports.on_load_success = function (realm_people_data) {
e.preventDefault();
e.stopPropagation();
// Go up the tree until we find the user row, then grab the email element
var button_elem = $(e.target);
var row = button_elem.closest(".user_row");
var user_id = row.attr("data-user-id");
var url = '/json/users/' + encodeURIComponent(user_id) + "/reactivate";
var data = {};
var status = get_status_field();
const button_elem = $(e.target);
const row = button_elem.closest(".user_row");
const user_id = row.attr("data-user-id");
const url = '/json/users/' + encodeURIComponent(user_id) + "/reactivate";
const data = {};
const status = get_status_field();
var opts = {
const opts = {
success_continuation: function () {
update_view_on_reactivate(row);
},
@@ -423,44 +423,44 @@ exports.on_load_success = function (realm_people_data) {
});
$(".admin_user_table, .admin_bot_table").on("click", ".open-user-form", function (e) {
var user_id = $(e.currentTarget).attr("data-user-id");
var person = people.get_person_from_user_id(user_id);
const user_id = $(e.currentTarget).attr("data-user-id");
const person = people.get_person_from_user_id(user_id);
if (!person) {
return;
}
var user_info_form_modal = open_user_info_form_modal(person);
var element = "#user-info-form-modal .custom-profile-field-form";
const user_info_form_modal = open_user_info_form_modal(person);
const element = "#user-info-form-modal .custom-profile-field-form";
$(element).html("");
settings_account.append_custom_profile_fields(element, user_id);
settings_account.initialize_custom_date_type_fields(element);
var fields_user_pills = settings_account.initialize_custom_user_type_fields(element,
user_id,
true, false);
const fields_user_pills = settings_account.initialize_custom_user_type_fields(element,
user_id,
true, false);
var url;
var data;
var full_name = user_info_form_modal.find("input[name='full_name']");
let url;
let data;
const full_name = user_info_form_modal.find("input[name='full_name']");
user_info_form_modal.find('.submit_user_info_change').on("click", function (e) {
e.preventDefault();
e.stopPropagation();
var user_role_select_value = user_info_form_modal.find('#user-role-select').val();
const user_role_select_value = user_info_form_modal.find('#user-role-select').val();
var admin_status = get_status_field();
const admin_status = get_status_field();
if (person.is_bot) {
url = "/json/bots/" + encodeURIComponent(user_id);
data = {
full_name: full_name.val(),
};
var owner_select_value = user_info_form_modal.find('.bot_owner_select').val();
const owner_select_value = user_info_form_modal.find('.bot_owner_select').val();
if (owner_select_value) {
data.bot_owner_id = people.get_by_email(owner_select_value).user_id;
}
} else {
var new_profile_data = [];
const new_profile_data = [];
$("#user-info-form-modal .custom_user_field_value").each(function () {
// Remove duplicate datepicker input element genearted flatpicker library
if (!$(this).hasClass("form-control")) {
@@ -473,7 +473,7 @@ exports.on_load_success = function (realm_people_data) {
// Append user type field values also
_.each(fields_user_pills, function (field_pills, field_id) {
if (field_pills) {
var user_ids = user_pill.get_user_ids(field_pills);
const user_ids = user_pill.get_user_ids(field_pills);
new_profile_data.push({
id: parseInt(field_id, 10),
value: user_ids,