Skip to content

Scope clearToasts to the dialog being closed #3414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Salvialf wants to merge 1 commit into
base: develop
Choose a base branch
from
+8 −4
Open

Scope clearToasts to the dialog being closed #3414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions core/dom/dom.ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,8 +811,12 @@ var jeeDialog = (function() {
})
return toast
}
exports.clearToasts = function() {
document.querySelectorAll('.jeeToastContainer')?.remove()
exports.clearToasts = function(_scope) {
document.querySelectorAll('.jeeToastContainer').forEach(function(_container) {
if (!_scope || _scope.contains(_container)) {
_container.remove()
}
})
return true
}

Expand Down Expand Up @@ -1604,7 +1608,7 @@ var jeeDialog = (function() {
close: function() {
this.dialog._jeeDialog.options.beforeClose()
this.dialog.querySelector('div.jeeDialogContent').empty()
jeeDialog.clearToasts()
jeeDialog.clearToasts(this.dialog)
this.dialog.unseen()
this.dialog._jeeDialog.options.onClose()
this.dialog.removeClass('active')
Expand Down Expand Up @@ -1804,7 +1808,7 @@ var jeeCtxMenu = function(_options) {
display: null
})
_ctxMenu.seen()

//Is there use positionning:
if (ctxInstance.options.position) {
ctxInstance.options.position.apply(ctxInstance, [ctxInstance, _event.clientX, _event.clientY])
Expand Down
Loading