github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Popup#afterConfirm popup broke features like "Archiv Cards", "Upload Attachements" and so on -> fixed

Browse source
This commit is contained in:
Martin Filser 2021-10-25 00:27:54 +02:00
parent 66df3cc2ee
commit fecb9cdb66
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/cards/minicard.js
View file

@ -55,7 +55,7 @@ BlazeComponent.extendComponent({
*/
cardLabelsPopup(event) {
if (this.find('.js-card-label:hover')) {
Popup.open("cardLabels")(event, this.currentData());
Popup.open("cardLabels")(event, {dataContextIfCurrentDataIsUndefined: this.currentData()});
}
},

6
client/lib/popup.js
View file

@ -32,9 +32,9 @@ window.Popup = new (class {
}
/** opens the popup
* @param evt the current event
* @param dataContextIfCurrentDataIsUndefined use this dataContext if this.currentData() is undefined
* @param options options (dataContextIfCurrentDataIsUndefined use this dataContext if this.currentData() is undefined)
*/
return function(evt, dataContextIfCurrentDataIsUndefined) {
return function(evt, options) {
// If a popup is already opened, clicking again on the opener element
// should close it -- and interrupt the current `open` function.
if (self.isOpen()) {
@ -71,7 +71,7 @@ window.Popup = new (class {
title: self._getTitle(popupName),
depth: self._stack.length,
offset: self._getOffset(openerElement),
dataContext: (this && this.currentData && this.currentData()) || dataContextIfCurrentDataIsUndefined || this,
dataContext: (this && this.currentData && this.currentData()) || (options && options.dataContextIfCurrentDataIsUndefined) || this,
});
// If there are no popup currently opened we use the Blaze API to render