Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

js: Access ‘disabled’ as a property, not an attribute. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-07-21 17:59:06 -07:00 committed by Tim Abbott
parent 6800c3363f
commit 498fe285fa
18 changed files with 71 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/compose.js
View File

@ -590,7 +590,7 @@ run_test("send_message_success", () => {
$("#compose-textarea").val("foobarfoobar");
$("#compose-textarea").trigger("blur");
$("#compose-send-status").show();
$("#compose-send-button").attr("disabled", "disabled");
$("#compose-send-button").prop("disabled", true);
$("#sending-indicator").show();
let reify_message_id_checked;
@ -688,7 +688,7 @@ run_test("send_message", () => {
$("#compose-textarea").val("[foobar]" + "(https://foo.com/user_uploads/123456)");
$("#compose-textarea").trigger("blur");
$("#compose-send-status").show();
$("#compose-send-button").attr("disabled", "disabled");
$("#compose-send-button").prop("disabled", true);
$("#sending-indicator").show();
compose.send_message();
@ -740,7 +740,7 @@ run_test("send_message", () => {
$("#compose-textarea").val("foobarfoobar");
$("#compose-textarea").trigger("blur");
$("#compose-send-status").show();
$("#compose-send-button").attr("disabled", "disabled");
$("#compose-send-button").prop("disabled", true);
$("#sending-indicator").show();
$("#compose-textarea").off("select");
echo_error_msg_checked = false;
@ -1027,7 +1027,7 @@ run_test("initialize", () => {
})();
(function test_abort_xhr() {
$("#compose-send-button").attr("disabled", "disabled");
$("#compose-send-button").prop("disabled", true);
reset_jquery();
stub_out_video_calls();

44
frontend_tests/node_tests/settings_org.js
View File

@ -927,76 +927,64 @@ run_test("misc", () => {
page_params.realm_name_changes_disabled = false;
page_params.server_name_changes_disabled = false;
settings_account.update_name_change_display();
assert.equal($("#full_name").attr("disabled"), false);
assert(!$("#full_name").prop("disabled"));
assert.equal($(".change_name_tooltip").is(":visible"), false);
page_params.realm_name_changes_disabled = true;
page_params.server_name_changes_disabled = false;
settings_account.update_name_change_display();
assert.equal($("#full_name").attr("disabled"), "disabled");
assert($("#full_name").prop("disabled"));
assert($(".change_name_tooltip").is(":visible"));
page_params.realm_name_changes_disabled = true;
page_params.server_name_changes_disabled = true;
settings_account.update_name_change_display();
assert.equal($("#full_name").attr("disabled"), "disabled");
assert($("#full_name").prop("disabled"));
assert($(".change_name_tooltip").is(":visible"));
page_params.realm_name_changes_disabled = false;
page_params.server_name_changes_disabled = true;
settings_account.update_name_change_display();
assert.equal($("#full_name").attr("disabled"), "disabled");
assert($("#full_name").prop("disabled"));
assert($(".change_name_tooltip").is(":visible"));
page_params.realm_email_changes_disabled = false;
settings_account.update_email_change_display();
assert.equal($("#change_email .button").attr("disabled"), false);
assert(!$("#change_email .button").prop("disabled"));
page_params.realm_email_changes_disabled = true;
settings_account.update_email_change_display();
assert.equal($("#change_email .button").attr("disabled"), "disabled");
assert($("#change_email .button").prop("disabled"));
page_params.realm_avatar_changes_disabled = false;
page_params.server_avatar_changes_disabled = false;
settings_account.update_avatar_change_display();
assert.equal($("#user-avatar-upload-widget .image_upload_button").attr("disabled"), false);
assert.equal(
$("#user-avatar-upload-widget .image-delete-button .button").attr("disabled"),
false,
);
assert(!$("#user-avatar-upload-widget .image_upload_button").prop("disabled"));
assert(!$("#user-avatar-upload-widget .image-delete-button .button").prop("disabled"));
page_params.realm_avatar_changes_disabled = true;
page_params.server_avatar_changes_disabled = false;
settings_account.update_avatar_change_display();
assert.equal($("#user-avatar-upload-widget .image_upload_button").attr("disabled"), "disabled");
assert.equal(
$("#user-avatar-upload-widget .image-delete-button .button").attr("disabled"),
"disabled",
);
assert($("#user-avatar-upload-widget .image_upload_button").prop("disabled"));
assert($("#user-avatar-upload-widget .image-delete-button .button").prop("disabled"));
page_params.realm_avatar_changes_disabled = false;
page_params.server_avatar_changes_disabled = true;
settings_account.update_avatar_change_display();
assert.equal($("#user-avatar-upload-widget .image_upload_button").attr("disabled"), "disabled");
assert.equal(
$("#user-avatar-upload-widget .image-delete-button .button").attr("disabled"),
"disabled",
);
assert($("#user-avatar-upload-widget .image_upload_button").prop("disabled"));
assert($("#user-avatar-upload-widget .image-delete-button .button").prop("disabled"));
page_params.realm_avatar_changes_disabled = true;
page_params.server_avatar_changes_disabled = true;
settings_account.update_avatar_change_display();
assert.equal($("#user-avatar-upload-widget .image_upload_button").attr("disabled"), "disabled");
assert.equal(
$("#user-avatar-upload-widget .image-delete-button .button").attr("disabled"),
"disabled",
);
assert($("#user-avatar-upload-widget .image_upload_button").prop("disabled"));
assert($("#user-avatar-upload-widget .image-delete-button .button").prop("disabled"));
// If organization admin, these UI elements are never disabled.
page_params.is_admin = true;
settings_account.update_name_change_display();
assert.equal($("#full_name").attr("disabled"), false);
assert(!$("#full_name").prop("disabled"));
assert.equal($(".change_name_tooltip").is(":visible"), false);
settings_account.update_email_change_display();
assert.equal($("#change_email .button").attr("disabled"), false);
assert(!$("#change_email .button").prop("disabled"));
stream_data.get_streams_for_settings_page = () => {
const arr = [];

12
frontend_tests/node_tests/upload.js
View File

@ -137,7 +137,7 @@ run_test("get_item", () => {
});
run_test("hide_upload_status", () => {
$("#compose-send-button").prop("disabled", "");
$("#compose-send-button").prop("disabled", true);
$("#compose-send-status").addClass("alert-info").show();
upload.hide_upload_status({mode: "compose"});
@ -148,7 +148,7 @@ run_test("hide_upload_status", () => {
});
run_test("show_error_message", () => {
$("#compose-send-button").prop("disabled", "");
$("#compose-send-button").prop("disabled", true);
$("#compose-send-status").addClass("alert-info").removeClass("alert-error").hide();
$("#compose-error-msg").text("");
$("#compose-error-msg").hide();
@ -192,9 +192,9 @@ run_test("upload_files", () => {
assert(config.mode, "compose");
};
const config = {mode: "compose"};
$("#compose-send-button").attr("disabled", false);
$("#compose-send-button").prop("disabled", false);
upload.upload_files(uppy, config, []);
assert.equal($("#compose-send-button").attr("disabled"), false);
assert(!$("#compose-send-button").prop("disabled"));
page_params.max_file_upload_size_mib = 0;
let show_error_message_called = false;
@ -225,10 +225,10 @@ run_test("upload_files", () => {
compose_ui.autosize_textarea = () => {
compose_ui_autosize_textarea_called = true;
};
$("#compose-send-button").attr("disabled", false);
$("#compose-send-button").prop("disabled", false);
$("#compose-send-status").removeClass("alert-info").hide();
upload.upload_files(uppy, config, files);
assert.equal($("#compose-send-button").attr("disabled"), "");
assert($("#compose-send-button").prop("disabled"));
assert($("#compose-send-status").hasClass("alert-info"));
assert($("#compose-send-status").visible());
assert.equal($("<p>").text(), "translated: Uploading…");

4
static/js/compose.js
View File

@ -696,7 +696,7 @@ function validate_private_message() {
}
exports.validate = function () {
$("#compose-send-button").attr("disabled", "disabled").trigger("blur");
$("#compose-send-button").prop("disabled", true).trigger("blur");
const message_content = compose_state.message_content();
if (reminder.is_deferred_delivery(message_content)) {
show_sending_indicator(i18n.t("Scheduling..."));
@ -1062,7 +1062,7 @@ exports.initialize = function () {
function failure(error_msg) {
exports.clear_invites();
compose_error(error_msg, $("#compose-textarea"));
$(event.target).attr("disabled", true);
$(event.target).prop("disabled", true);
}
function xhr_failure(xhr) {

4
static/js/composebox_typeahead.js
View File

@ -237,8 +237,8 @@ function handle_keydown(e) {
if (on_compose && code === 13) {
if (exports.should_enter_send(e)) {
e.preventDefault();
if ($("#compose-send-button").attr("disabled") !== "disabled") {
$("#compose-send-button").attr("disabled", "disabled");
if (!$("#compose-send-button").prop("disabled")) {
$("#compose-send-button").prop("disabled", true);
compose.finish();
}
return;

4
static/js/message_edit.js
View File

@ -186,7 +186,7 @@ function handle_message_row_edit_keydown(e) {
if (composebox_typeahead.should_enter_send(e)) {
const row = $(".message_edit_content").filter(":focus").closest(".message_row");
const message_edit_save_button = row.find(".message_edit_save");
if (message_edit_save_button.attr("disabled") === "disabled") {
if (message_edit_save_button.prop("disabled")) {
// In cases when the save button is disabled
// we need to disable save on pressing enter
// Prevent default to avoid new-line on pressing
@ -818,7 +818,7 @@ exports.edit_last_sent_message = function () {
function hide_delete_btn_show_spinner(deleting) {
if (deleting) {
$("do_delete_message_button").attr("disabled", "disabled");
$("do_delete_message_button").prop("disabled", true);
$("#delete_message_modal > div.modal-footer > button").hide();
const delete_spinner = $("#do_delete_message_spinner");
loading.make_indicator(delete_spinner, {abs_positioned: true});

4
static/js/narrow.js
View File

@ -1036,13 +1036,13 @@ exports.show_empty_narrow_message = function () {
"title",
i18n.t("There are no messages to reply to."),
);
$("#left_bar_compose_reply_button_big").attr("disabled", "disabled");
$("#left_bar_compose_reply_button_big").prop("disabled", true);
};
exports.hide_empty_narrow_message = function () {
$(".empty_feed_notice").hide();
$("#left_bar_compose_reply_button_big").attr("title", i18n.t("Reply (r)"));
$("#left_bar_compose_reply_button_big").removeAttr("disabled");
$("#left_bar_compose_reply_button_big").prop("disabled", false);
};
window.narrow = exports;

8
static/js/reminder.js
View File

@ -56,7 +56,7 @@ exports.schedule_message = function (request) {
deliver_at.trim() === "" ||
command_line.slice(command.length, command.length + 1) !== " "
) {
$("#compose-textarea").attr("disabled", false);
$("#compose-textarea").prop("disabled", false);
if (command_line.slice(command.length, command.length + 1) !== " ") {
compose.compose_error(
i18n.t(
@ -85,16 +85,16 @@ exports.schedule_message = function (request) {
"Scheduled your Message to be delivered at: " + data.deliver_at,
);
}
$("#compose-textarea").attr("disabled", false);
$("#compose-textarea").prop("disabled", false);
compose.clear_compose_box();
};
const error = function (response) {
$("#compose-textarea").attr("disabled", false);
$("#compose-textarea").prop("disabled", false);
compose.compose_error(response, $("#compose-textarea"));
};
/* We are adding a disable on compose under this block because we
want slash commands to be blocking in nature. */
$("#compose-textarea").attr("disabled", true);
$("#compose-textarea").prop("disabled", true);
transmit.send_message(request, success, error);
};

16
static/js/settings_account.js
View File

@ -47,31 +47,31 @@ exports.user_can_change_avatar = function () {
exports.update_name_change_display = function () {
if (!exports.user_can_change_name()) {
$("#full_name").attr("disabled", "disabled");
$("#full_name").prop("disabled", true);
$(".change_name_tooltip").show();
} else {
$("#full_name").attr("disabled", false);
$("#full_name").prop("disabled", false);
$(".change_name_tooltip").hide();
}
};
exports.update_email_change_display = function () {
if (page_params.realm_email_changes_disabled && !page_params.is_admin) {
$("#change_email .button").attr("disabled", "disabled");
$("#change_email .button").prop("disabled", true);
$(".change_email_tooltip").show();
} else {
$("#change_email .button").attr("disabled", false);
$("#change_email .button").prop("disabled", false);
$(".change_email_tooltip").hide();
}
};
exports.update_avatar_change_display = function () {
if (!exports.user_can_change_avatar()) {
$("#user-avatar-upload-widget .image_upload_button").attr("disabled", "disabled");
$("#user-avatar-upload-widget .image-delete-button .button").attr("disabled", "disabled");
$("#user-avatar-upload-widget .image_upload_button").prop("disabled", true);
$("#user-avatar-upload-widget .image-delete-button .button").prop("disabled", true);
} else {
$("#user-avatar-upload-widget .image_upload_button").attr("disabled", false);
$("#user-avatar-upload-widget .image-delete-button .button").attr("disabled", false);
$("#user-avatar-upload-widget .image_upload_button").prop("disabled", false);
$("#user-avatar-upload-widget .image-delete-button .button").prop("disabled", false);
}
};

6
static/js/settings_emoji.js
View File

@ -168,7 +168,7 @@ exports.set_up = function () {
e.preventDefault();
e.stopPropagation();
const emoji_status = $("#admin-emoji-status");
$("#admin_emoji_submit").attr("disabled", true);
$("#admin_emoji_submit").prop("disabled", true);
const emoji = {};
const formData = new FormData();
@ -189,7 +189,7 @@ exports.set_up = function () {
$("#admin-emoji-status").hide();
ui_report.success(i18n.t("Custom emoji added!"), emoji_status);
$("form.admin-emoji-form input[type='text']").val("");
$("#admin_emoji_submit").removeAttr("disabled");
$("#admin_emoji_submit").prop("disabled", false);
emoji_widget.clear();
},
error(xhr) {
@ -197,7 +197,7 @@ exports.set_up = function () {
const errors = JSON.parse(xhr.responseText).msg;
xhr.responseText = JSON.stringify({msg: errors});
ui_report.error(i18n.t("Failed"), xhr, emoji_status);
$("#admin_emoji_submit").removeAttr("disabled");
$("#admin_emoji_submit").prop("disabled", false);
},
});
});

6
static/js/settings_linkifiers.js
View File

@ -112,7 +112,7 @@ exports.build_page = function () {
const pattern_status = $("#admin-filter-pattern-status");
const format_status = $("#admin-filter-format-status");
const add_filter_button = $(".new-filter-form button");
add_filter_button.attr("disabled", "disabled");
add_filter_button.prop("disabled", true);
filter_status.hide();
pattern_status.hide();
format_status.hide();
@ -128,13 +128,13 @@ exports.build_page = function () {
success(data) {
$("#filter_pattern").val("");
$("#filter_format_string").val("");
add_filter_button.removeAttr("disabled");
add_filter_button.prop("disabled", false);
filter.id = data.id;
ui_report.success(i18n.t("Custom filter added!"), filter_status);
},
error(xhr) {
const errors = JSON.parse(xhr.responseText).errors;
add_filter_button.removeAttr("disabled");
add_filter_button.prop("disabled", false);
if (errors.pattern !== undefined) {
xhr.responseText = JSON.stringify({msg: errors.pattern});
ui_report.error(i18n.t("Failed"), xhr, pattern_status);

12
static/js/settings_org.js
View File

@ -18,21 +18,21 @@ exports.maybe_disable_widgets = function () {
$(".organization-box [data-name='auth-methods']")
.find("input, button, select, checked")
.attr("disabled", true);
.prop("disabled", true);
if (page_params.is_admin) {
$("#deactivate_realm_button").attr("disabled", true);
$("#org-message-retention").find("input, select").attr("disabled", true);
$("#deactivate_realm_button").prop("disabled", true);
$("#org-message-retention").find("input, select").prop("disabled", true);
return;
}
$(".organization-box [data-name='organization-profile']")
.find("input, textarea, button, select")
.attr("disabled", true);
.prop("disabled", true);
$(".organization-box [data-name='organization-settings']")
.find("input, textarea, button, select")
.attr("disabled", true);
.prop("disabled", true);
$(".organization-box [data-name='organization-settings']")
.find(".control-label-disabled")
@ -40,7 +40,7 @@ exports.maybe_disable_widgets = function () {
$(".organization-box [data-name='organization-permissions']")
.find("input, textarea, button, select")
.attr("disabled", true);
.prop("disabled", true);
$(".organization-box [data-name='organization-permissions']")
.find(".control-label-disabled")

2
static/js/settings_profile_fields.js
View File

@ -12,7 +12,7 @@ exports.maybe_disable_widgets = function () {
$(".organization-box [data-name='profile-field-settings']")
.find("input, button, select")
.attr("disabled", true);
.prop("disabled", true);
};
let order = [];

2
static/js/settings_streams.js
View File

@ -15,7 +15,7 @@ exports.maybe_disable_widgets = function () {
$(".organization-box [data-name='default-streams-list']")
.find("input:not(.search), button, select")
.attr("disabled", true);
.prop("disabled", true);
};
exports.build_default_stream_table = function () {

4
static/js/settings_ui.js
View File

@ -75,12 +75,12 @@ exports.do_settings_change = function (request_method, url, data, status_element
// when main setting unchecked.
exports.disable_sub_setting_onchange = function (is_checked, sub_setting_id, disable_on_uncheck) {
if ((is_checked && disable_on_uncheck) || (!is_checked && !disable_on_uncheck)) {
$("#" + sub_setting_id).attr("disabled", false);
$("#" + sub_setting_id).prop("disabled", false);
$("#" + sub_setting_id + "_label")
.parent()
.removeClass("control-label-disabled");
} else if ((is_checked && !disable_on_uncheck) || (!is_checked && disable_on_uncheck)) {
$("#" + sub_setting_id).attr("disabled", "disabled");
$("#" + sub_setting_id).prop("disabled", true);
$("#" + sub_setting_id + "_label")
.parent()
.addClass("control-label-disabled");

10
static/js/stream_ui_updates.js
View File

@ -70,7 +70,7 @@ exports.update_settings_button_for_sub = function (sub) {
} else {
settings_button.attr("title", "");
exports.initialize_cant_subscribe_popover(sub);
settings_button.attr("disabled", "disabled");
settings_button.prop("disabled", true);
}
};
@ -234,13 +234,13 @@ exports.update_add_subscriptions_elements = function (sub) {
const allow_user_to_add_subs = sub.can_add_subscribers;
if (allow_user_to_add_subs) {
input_element.removeAttr("disabled");
button_element.removeAttr("disabled");
input_element.prop("disabled", false);
button_element.prop("disabled", false);
button_element.css("pointer-events", "");
$(".add_subscribers_container input").popover("destroy");
} else {
input_element.attr("disabled", "disabled");
button_element.attr("disabled", "disabled");
input_element.prop("disabled", true);
button_element.prop("disabled", true);
exports.initialize_disable_btn_hint_popover(
$(".add_subscribers_container"),

2
static/js/upload.js
View File

@ -110,7 +110,7 @@ exports.upload_files = function (uppy, config, files) {
);
return;
}
exports.get_item("send_button", config).attr("disabled", "");
exports.get_item("send_button", config).prop("disabled", true);
exports
.get_item("send_status", config)
.addClass("alert-info")

6
static/js/user_status_ui.js
View File

@ -23,7 +23,7 @@ exports.open_overlay = function () {
exports.toggle_clear_message_button();
const button = exports.submit_button();
button.attr("disabled", true);
button.prop("disabled", true);
};
exports.close_overlay = function () {
@ -57,9 +57,9 @@ exports.update_button = function () {
const button = exports.submit_button();
if (old_status_text === new_status_text) {
button.attr("disabled", true);
button.prop("disabled", true);
} else {
button.attr("disabled", false);
button.prop("disabled", false);
}
};