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

confirm_dialog: Rename confirm_dialog_yes_button class.

Browse Source 
This commit renames confirm_dialog_yes_button class to
confirm_dialog_submit_button. This will help in keeping
a general class name when deduplicating the code for
confirm_dialog and edit_fields_modal.
This commit is contained in:
sahil839
2021-07-05 18:54:28 +05:30
committed by Tim Abbott
parent 055d7113f2
commit 8fe401c38c
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/puppeteer_tests/delete-message.ts
View File

@@ -19,11 +19,11 @@ async function delete_message_test(page: Page): Promise<void> {
const last_message_id = await click_delete_and_return_last_msg_id(page); const last_message_id = await click_delete_and_return_last_msg_id(page);
await page.waitForSelector("#confirm_dialog_modal", {visible: true}); await page.waitForSelector("#confirm_dialog_modal", {visible: true});
await page.click(".confirm_dialog_yes_button"); await page.click(".confirm_dialog_submit_button");
await page.waitForSelector(".confirm_dialog_yes_button .loader", { await page.waitForSelector(".confirm_dialog_submit_button .loader", {
visible: true, visible: true,
}); });
await page.waitForSelector(".confirm_dialog_yes_button span", {hidden: true}); await page.waitForSelector(".confirm_dialog_submit_button span", {hidden: true});
await page.waitForFunction( await page.waitForFunction(
(expected_length: number) => $("#zhome .message_row").length === expected_length, (expected_length: number) => $("#zhome .message_row").length === expected_length,
@@ -32,7 +32,7 @@ async function delete_message_test(page: Page): Promise<void> {
); );
await page.waitForSelector(`#${CSS.escape(last_message_id!)}`, {hidden: true}); await page.waitForSelector(`#${CSS.escape(last_message_id!)}`, {hidden: true});
await page.waitForSelector(".confirm_dialog_yes_button .loader", { await page.waitForSelector(".confirm_dialog_submit_button .loader", {
hidden: true, hidden: true,
}); });
} }

4
frontend_tests/puppeteer_tests/user-deactivation.ts
View File

@@ -33,12 +33,12 @@ async function test_deactivate_user(page: Page): Promise<void> {
assert.strictEqual( assert.strictEqual(
await common.get_text_from_selector( await common.get_text_from_selector(
page, page,
"#confirm_dialog_modal .confirm_dialog_yes_button", "#confirm_dialog_modal .confirm_dialog_submit_button",
), ),
"Confirm", "Confirm",
"Deactivate button has incorrect text.", "Deactivate button has incorrect text.",
); );
await page.click("#confirm_dialog_modal .confirm_dialog_yes_button"); await page.click("#confirm_dialog_modal .confirm_dialog_submit_button");
await page.waitForSelector("#user-field-status", {hidden: true}); await page.waitForSelector("#user-field-status", {hidden: true});
} }

18
static/js/confirm_dialog.js
View File

@@ -36,16 +36,16 @@ import * as overlays from "./overlays";
*/ */
export function hide_confirm_dialog_spinner() { export function hide_confirm_dialog_spinner() {
$(".confirm_dialog_yes_button .loader").hide(); $(".confirm_dialog_submit_button .loader").hide();
$(".confirm_dialog_yes_button span").show(); $(".confirm_dialog_submit_button span").show();
$(".confirm_dialog_yes_button").prop("disabled", false); $(".confirm_dialog_submit_button").prop("disabled", false);
} }
export function show_confirm_dialog_spinner() { export function show_confirm_dialog_spinner() {
$(".confirm_dialog_yes_button .loader").css("display", "inline-block"); $(".confirm_dialog_submit_button .loader").css("display", "inline-block");
$(".confirm_dialog_yes_button span").hide(); $(".confirm_dialog_submit_button span").hide();
$(".confirm_dialog_yes_button").prop("disabled", true); $(".confirm_dialog_submit_button").prop("disabled", true);
$(".confirm_dialog_yes_button object").on("load", function () { $(".confirm_dialog_submit_button object").on("load", function () {
const doc = this.getSVGDocument(); const doc = this.getSVGDocument();
const $svg = $(doc).find("svg"); const $svg = $(doc).find("svg");
$svg.find("rect").css("fill", "#000"); $svg.find("rect").css("fill", "#000");
@@ -89,11 +89,11 @@ export function launch(conf) {
); );
confirm_dialog.find(".confirm_dialog_body").append(conf.html_body); confirm_dialog.find(".confirm_dialog_body").append(conf.html_body);
const submit_button_span = confirm_dialog.find(".confirm_dialog_yes_button span"); const submit_button_span = confirm_dialog.find(".confirm_dialog_submit_button span");
submit_button_span.html(conf.html_submit_button); submit_button_span.html(conf.html_submit_button);
const submit_button = confirm_dialog.find(".confirm_dialog_yes_button"); const submit_button = confirm_dialog.find(".confirm_dialog_submit_button");
// Set up handlers. // Set up handlers.
submit_button.on("click", () => { submit_button.on("click", () => {
if (conf.loading_spinner) { if (conf.loading_spinner) {

12
static/js/settings_invites.js
View File

@@ -97,8 +97,8 @@ function populate_invites(invites_data) {
} }
function do_revoke_invite() { function do_revoke_invite() {
const modal_invite_id = $(".confirm_dialog_yes_button").attr("data-invite-id"); const modal_invite_id = $(".confirm_dialog_submit_button").attr("data-invite-id");
const modal_is_multiuse = $(".confirm_dialog_yes_button").attr("data-is-multiuse"); const modal_is_multiuse = $(".confirm_dialog_submit_button").attr("data-is-multiuse");
const revoke_button = meta.current_revoke_invite_user_modal_row.find("button.revoke"); const revoke_button = meta.current_revoke_invite_user_modal_row.find("button.revoke");
if (modal_invite_id !== meta.invite_id || modal_is_multiuse !== meta.is_multiuse) { if (modal_invite_id !== meta.invite_id || modal_is_multiuse !== meta.is_multiuse) {
@@ -129,7 +129,7 @@ function do_revoke_invite() {
} }
function do_resend_invite() { function do_resend_invite() {
const modal_invite_id = $(".confirm_dialog_yes_button").attr("data-invite-id"); const modal_invite_id = $(".confirm_dialog_submit_button").attr("data-invite-id");
const resend_button = meta.current_resend_invite_user_modal_row.find("button.resend"); const resend_button = meta.current_resend_invite_user_modal_row.find("button.resend");
if (modal_invite_id !== meta.invite_id) { if (modal_invite_id !== meta.invite_id) {
@@ -211,8 +211,8 @@ export function on_load_success(invites_data, initialize_event_handlers) {
fade: true, fade: true,
}); });
$(".confirm_dialog_yes_button").attr("data-invite-id", meta.invite_id); $(".confirm_dialog_submit_button").attr("data-invite-id", meta.invite_id);
$(".confirm_dialog_yes_button").attr("data-is-multiuse", meta.is_multiuse); $(".confirm_dialog_submit_button").attr("data-is-multiuse", meta.is_multiuse);
}); });
$(".admin_invites_table").on("click", ".resend", (e) => { $(".admin_invites_table").on("click", ".resend", (e) => {
@@ -237,6 +237,6 @@ export function on_load_success(invites_data, initialize_event_handlers) {
fade: true, fade: true,
}); });
$(".confirm_dialog_yes_button").attr("data-invite-id", meta.invite_id); $(".confirm_dialog_submit_button").attr("data-invite-id", meta.invite_id);
}); });
} }

4
static/js/stream_edit.js
View File

@@ -926,7 +926,7 @@ export function initialize() {
} }
function do_archive_stream() { function do_archive_stream() {
const stream_id = $(".confirm_dialog_yes_button").data("stream-id"); const stream_id = $(".confirm_dialog_submit_button").data("stream-id");
if (!stream_id) { if (!stream_id) {
ui_report.client_error( ui_report.client_error(
$t_html({defaultMessage: "Invalid stream id"}), $t_html({defaultMessage: "Invalid stream id"}),
@@ -957,7 +957,7 @@ export function initialize() {
fade: true, fade: true,
}); });
$(".confirm_dialog_yes_button").attr("data-stream-id", stream_id); $(".confirm_dialog_submit_button").attr("data-stream-id", stream_id);
}); });
$("#subscriptions_table").on("click", ".stream-row", function (e) { $("#subscriptions_table").on("click", ".stream-row", function (e) {

2
static/styles/settings.css
View File

@@ -1578,7 +1578,7 @@ body:not(.night-mode) #settings_page .custom_user_field .datepicker {
margin-top: 10px; margin-top: 10px;
} }
.confirm_dialog_yes_button .loader { .confirm_dialog_submit_button .loader {
display: none; display: none;
vertical-align: top; vertical-align: top;
position: relative; position: relative;

2
static/templates/confirm_dialog.hbs
View File

@@ -8,7 +8,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="button rounded close-modal-btn" data-dismiss="modal">{{t "Cancel" }}</button> <button class="button rounded close-modal-btn" data-dismiss="modal">{{t "Cancel" }}</button>
<button class="button rounded btn-danger confirm_dialog_yes_button"> <button class="button rounded btn-danger confirm_dialog_submit_button">
<object class="loader" type="image/svg+xml" data="/static/images/loader.svg"></object> <object class="loader" type="image/svg+xml" data="/static/images/loader.svg"></object>
<span></span> <span></span>
</button> </button>