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

Revert "confirm_dialog: Make Bootstrap fade class optional."

Browse Source 
This reverts commit 7b4039ade6.

This fails puppeteer tests after being rebased.
This commit is contained in:
Tim Abbott
2021-06-09 11:00:43 -07:00
parent d905eb6131
commit 7bfa607d0a
7 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/avatar.js
View File

@@ -105,7 +105,6 @@ export function build_user_avatar_widget(upload_function) {
html_body, html_body,
html_yes_button: $t_html({defaultMessage: "Confirm"}), html_yes_button: $t_html({defaultMessage: "Confirm"}),
on_click: delete_user_avatar, on_click: delete_user_avatar,
fade: true,
}); });
}); });

4
static/js/confirm_dialog.js
View File

@@ -32,7 +32,7 @@ import * as overlays from "./overlays";
*/ */
export function launch(conf) { export function launch(conf) {
const html = render_confirm_dialog({fade: conf.fade}); const html = render_confirm_dialog();
const confirm_dialog = $(html); const confirm_dialog = $(html);
const conf_fields = [ const conf_fields = [
@@ -47,7 +47,7 @@ export function launch(conf) {
]; ];
for (const f of conf_fields) { for (const f of conf_fields) {
if (conf[f] === undefined) { if (!conf[f]) {
blueslip.error("programmer omitted " + f); blueslip.error("programmer omitted " + f);
} }
} }

1
static/js/settings_emoji.js
View File

@@ -251,7 +251,6 @@ export function set_up() {
html_body, html_body,
html_yes_button: $t_html({defaultMessage: "Yes"}), html_yes_button: $t_html({defaultMessage: "Yes"}),
on_click: submit_custom_emoji_request, on_click: submit_custom_emoji_request,
fade: true,
}); });
} else { } else {
submit_custom_emoji_request(); submit_custom_emoji_request();

1
static/js/settings_user_groups.js
View File

@@ -368,7 +368,6 @@ export function set_up() {
html_body, html_body,
html_yes_button: $t_html({defaultMessage: "Confirm"}), html_yes_button: $t_html({defaultMessage: "Confirm"}),
on_click: delete_user_group, on_click: delete_user_group,
fade: true,
}); });
}); });

1
static/js/stream_edit.js
View File

@@ -872,7 +872,6 @@ export function initialize() {
html_body, html_body,
html_yes_button: $t_html({defaultMessage: "Confirm"}), html_yes_button: $t_html({defaultMessage: "Confirm"}),
on_click: remove_user_from_private_stream, on_click: remove_user_from_private_stream,
fade: true,
}); });
return; return;
} }

1
static/js/subs.js
View File

@@ -971,7 +971,6 @@ export function unsubscribe_from_private_stream(sub, from_stream_popover) {
html_body, html_body,
html_yes_button: $t_html({defaultMessage: "Confirm"}), html_yes_button: $t_html({defaultMessage: "Confirm"}),
on_click: unsubscribe_from_stream, on_click: unsubscribe_from_stream,
fade: true,
}); });
} }

2
static/templates/confirm_dialog.hbs
View File

@@ -1,4 +1,4 @@
<div class="modal modal-bg new-style hide {{#if fade}}fade{{/if}}" id="confirm_dialog_modal" tabindex="-1" role="dialog" aria-labelledby="confirm_dialog_modal" aria-hidden="true"> <div class="modal modal-bg new-style hide fade" id="confirm_dialog_modal" tabindex="-1" role="dialog" aria-labelledby="confirm_dialog_modal" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close close-modal-btn" data-dismiss="modal" aria-label="{{t 'Close' }}"><span aria-hidden="true">&times;</span></button> <button type="button" class="close close-modal-btn" data-dismiss="modal" aria-label="{{t 'Close' }}"><span aria-hidden="true">&times;</span></button>
<div class="confirm_dialog_heading"></div> <div class="confirm_dialog_heading"></div>