Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-21 19:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Do not save bookmark if close (X) on modal is clicked (#9541)

Browse Source 
* After this change the bookmark will still be saved if clicking out of the modal or pressing escape
* To achieve this I implemented an initiatedBy parameter for modal closing from d-modal. If clicking on the cross it is initiated by close, if clicking out of the modal it is by click out.
* These options can then be compared in controllers consuming onClose

Co-authored-by: Joffrey JAFFEUX <j.jaffeux@gmail.com>
This commit is contained in:
Martin Brennan 2020-04-29 08:45:06 +10:00 committed by GitHub
parent 4ecc258835
commit 0d519c78fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/components/d-modal.js
View File

@ -76,10 +76,12 @@ export default Component.extend({
$target.hasClass("modal-middle-container") ||
$target.hasClass("modal-outer-container")
) {
// Delegate click to modal close if clicked outside.
// We do this because some CSS of ours seems to cover
// the backdrop and makes it unclickable.
$(".modal-header button.modal-close").click();
// Send modal close (which bubbles to ApplicationRoute) if clicked outside.
// We do this because some CSS of ours seems to cover the backdrop and makes
// it unclickable.
return (
this.attrs.closeModal && this.attrs.closeModal("initiatedByClickOut")
);
}
},

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

@ -84,7 +84,11 @@ export default Controller.extend(ModalFunctionality, {
* We always want to save the bookmark unless the user specifically
* clicks the save or cancel button to mimic browser behaviour.
*/
onClose() {
onClose(opts = {}) {
if (opts.initiatedByCloseButton) {
this._closeWithoutSaving = true;
}
this._unbindKeyboardShortcuts();
this._restoreGlobalShortcuts();
if (!this._closeWithoutSaving && !this._savingBookmarkManually) {

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

@ -155,7 +155,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
},
// Close the current modal, and destroy its state.
closeModal() {
closeModal(initiatedBy) {
const route = getOwner(this).lookup("route:application");
let modalController = route.controllerFor("modal");
const controllerName = modalController.get("name");
@ -178,7 +178,10 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
`controller:${controllerName}`
);
if (controller && controller.onClose) {
controller.onClose();
controller.onClose({
initiatedByCloseButton: initiatedBy === "initiatedByCloseButton",
initiatedByClickOut: initiatedBy === "initiatedByClickOut"
});
}
modalController.set("name", null);
}

2
app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
View File

@ -3,7 +3,7 @@
<div class="modal-inner-container">
<div class="modal-header">
{{#if dismissable}}
{{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" title="modal.close"}}
{{d-button icon="times" action=(route-action "closeModal" "initiatedByCloseButton") class="btn-flat modal-close close" title="modal.close"}}
{{/if}}
{{#if panels}}