From 0025212b3e769fa5a1f1db70134445ed30b0ac00 Mon Sep 17 00:00:00 2001
From: Martin Filser <github-wekan@linux-email.de>
Date: Sun, 24 Oct 2021 23:51:09 +0200
Subject: [PATCH] Minicard, label popup only opened if a label is clicked

---
 client/components/cards/minicard.js | 12 +++++++++++-
 client/lib/popup.js                 |  8 ++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/client/components/cards/minicard.js b/client/components/cards/minicard.js
index db4da7fb7..796ce6a6a 100644
--- a/client/components/cards/minicard.js
+++ b/client/components/cards/minicard.js
@@ -49,6 +49,16 @@ BlazeComponent.extendComponent({
     return false;
   },
 
+  /** opens the card label popup only if clicked onto a label
+   * <li> this is necessary to have the data context of the minicard.
+   *      if .js-card-label is used at click event, then only the data context of the label itself is available at this.currentData()
+   */
+  cardLabelsPopup(event) {
+    if (this.find('.js-card-label:hover')) {
+      Popup.open("cardLabels")(event, this.currentData());
+    }
+  },
+
   events() {
     return [
       {
@@ -65,7 +75,7 @@ BlazeComponent.extendComponent({
           }
         },
         'click span.badge-icon.fa.fa-sort, click span.badge-text.check-list-sort' : Popup.open("editCardSortOrder"),
-        'click .minicard-labels' : Popup.open("cardLabels"),
+        'click .minicard-labels' : this.cardLabelsPopup,
       }
     ];
   },
diff --git a/client/lib/popup.js b/client/lib/popup.js
index fa9e125bb..1e4dfa68a 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -30,7 +30,11 @@ window.Popup = new (class {
     function clickFromPopup(evt) {
       return $(evt.target).closest('.js-pop-over').length !== 0;
     }
-    return function(evt) {
+    /** opens the popup
+     * @param evt the current event
+     * @param dataContextIfCurrentDataIsUndefined use this dataContext if this.currentData() is undefined
+     */
+    return function(evt, dataContextIfCurrentDataIsUndefined) {
       // If a popup is already opened, clicking again on the opener element
       // should close it -- and interrupt the current `open` function.
       if (self.isOpen()) {
@@ -67,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()) || this,
+        dataContext: (this && this.currentData && this.currentData()) || dataContextIfCurrentDataIsUndefined || this,
       });
 
       // If there are no popup currently opened we use the Blaze API to render