github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 15:41:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Stop saving bookmark on modal press ESC (#14823)

Browse Source 
Since db7be947df the functionality
to not save a bookmark when pressing ESC on the modal has been
broken, because a new initiatedByESC event was introduced there
in d-modal instead of clicking on the modal close button. This
commit fixes the issue by adding an initiatedByESC property
to onClose inside application.js, and checking for that OR
initiatedByCloseButton in the bookmark modal.
This commit is contained in:
Martin Brennan 2021-11-05 13:43:19 +10:00 committed by GitHub
parent 1dddbf3d47
commit 8586088b87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/components/bookmark.js
View File

@ -239,12 +239,14 @@ export default Component.extend({
}
},
_onModalClose(initiatedByCloseButton) {
_onModalClose(closeOpts) {
// we want to close without saving if the user already saved
// manually or deleted the bookmark, as well as when the modal
// is just closed with the X button
this._closeWithoutSaving =
this._closeWithoutSaving || initiatedByCloseButton;
this._closeWithoutSaving ||
closeOpts.initiatedByCloseButton ||
closeOpts.initiatedByESC;
if (!this._closeWithoutSaving && !this._savingBookmarkManually) {
this._saveBookmark().catch((e) => this._handleSaveError(e));

2
app/assets/javascripts/discourse/app/controllers/bookmark.js
View File

@ -77,7 +77,7 @@ export default Controller.extend(ModalFunctionality, {
*/
onClose(opts = {}) {
if (this.onCloseHandler) {
this.onCloseHandler(opts.initiatedByCloseButton);
this.onCloseHandler(opts);
}
},
});

5
app/assets/javascripts/discourse/app/routes/application.js
View File

@ -174,13 +174,14 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
if (controller) {
this.appEvents.trigger("modal:closed", {
name: controllerName,
controller: controller,
controller,
});
if (controller.onClose) {
controller.onClose({
initiatedByCloseButton: initiatedBy === "initiatedByCloseButton",
initiatedByClickOut: initiatedBy === "initiatedByClickOut",
initiatedByESC: initiatedBy === "initiatedByESC",
});
}
}
@ -283,7 +284,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
if (!this.siteSettings.enable_local_logins && methods.length === 1) {
this.controllerFor("login").send("externalLogin", methods[0], {
signup: signup,
signup,
});
} else {
showModal(modal, { titleAriaElementId });