Merge branch 'feature-rules' of https://github.com/Angtrim/wekan into Angtrim-feature-rules

1 files changed, 25 insertions, 4 deletions

diff --git a/client/lib/utils.js b/client/lib/utils.js
index 5349e500..a15dac39 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -39,11 +39,11 @@ Utils = {
     if (!prevData && !nextData) {
       base = 0;
       increment = 1;
-    // If we drop the card in the first position
+      // If we drop the card in the first position
     } else if (!prevData) {
       base = nextData.sort - 1;
       increment = -1;
-    // If we drop the card in the last position
+      // If we drop the card in the last position
     } else if (!nextData) {
       base = prevData.sort + 1;
       increment = 1;
@@ -71,11 +71,11 @@ Utils = {
     if (!prevCardDomElement && !nextCardDomElement) {
       base = 0;
       increment = 1;
-    // If we drop the card in the first position
+      // If we drop the card in the first position
     } else if (!prevCardDomElement) {
       base = Blaze.getData(nextCardDomElement).sort - 1;
       increment = -1;
-    // If we drop the card in the last position
+      // If we drop the card in the last position
     } else if (!nextCardDomElement) {
       base = Blaze.getData(prevCardDomElement).sort + 1;
       increment = 1;
@@ -145,6 +145,7 @@ Utils = {
     });
   },
 
+<<<<<<< HEAD
   setMatomo(data){
     window._paq = window._paq || [];
     window._paq.push(['setDoNotTrack', data.doNotTrack]);
@@ -188,6 +189,26 @@ Utils = {
     } else if (matomo) {
       window._paq.push(['trackPageView']);
     }
+
+  getTriggerActionDesc(event, tempInstance) {
+    const jqueryEl = tempInstance.$(event.currentTarget.parentNode);
+    const triggerEls = jqueryEl.find(".trigger-content").children();
+    let finalString = "";
+    for (let i = 0; i < triggerEls.length; i++) {
+      const element = tempInstance.$(triggerEls[i]);
+      if (element.hasClass("trigger-text")) {
+        finalString += element.text().toLowerCase();
+      } else if (element.find("select").length > 0) {
+        finalString += element.find("select option:selected").text().toLowerCase();
+      } else if (element.find("input").length > 0) {
+        finalString += element.find("input").val();
+      }
+      // Add space
+      if (i != length - 1) {
+        finalString += " ";
+      }
+    }
+    return finalString;
   },
 };