Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-17 07:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
Lauri Ojansivu 2018-09-16 00:10:40 +03:00
commit 6673b79738
60 changed files with 3074 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/lib/utils.js
View file

@ -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;
},
};