From b2f23d619d1ff33e899080dca17d018f0e8d0963 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sat, 29 Dec 2018 17:36:57 +0100 Subject: Triggers by username, updated desc --- client/lib/utils.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'client/lib') diff --git a/client/lib/utils.js b/client/lib/utils.js index d46d8076..5ec62ef9 100644 --- a/client/lib/utils.js +++ b/client/lib/utils.js @@ -218,11 +218,14 @@ Utils = { const element = tempInstance.$(triggerEls[i]); if (element.hasClass('trigger-text')) { finalString += element.text().toLowerCase(); + } else if (element.hasClass('user-details')) { + console.log(element); + finalString += element.find('.trigger-text').text().toLowerCase()+ " " + element.find('input').val(); } 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 += ' '; -- cgit v1.2.3-1-g7c22 From a2d756074f05299248944ecce2cc87a9a28ab020 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 30 Dec 2018 22:08:34 +0100 Subject: Added swimlane trigger --- client/lib/utils.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'client/lib') diff --git a/client/lib/utils.js b/client/lib/utils.js index 5ec62ef9..f252a220 100644 --- a/client/lib/utils.js +++ b/client/lib/utils.js @@ -219,12 +219,19 @@ Utils = { if (element.hasClass('trigger-text')) { finalString += element.text().toLowerCase(); } else if (element.hasClass('user-details')) { - console.log(element); - finalString += element.find('.trigger-text').text().toLowerCase()+ " " + element.find('input').val(); + let username = element.find('input').val(); + if(username == undefined || username == ""){ + username = "*"; + } + finalString += element.find('.trigger-text').text().toLowerCase()+ " " + username ; } 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(); + let inputvalue = element.find('input').val(); + if(inputvalue == undefined || inputvalue == ""){ + inputvalue = "*"; + } + finalString += inputvalue; } // Add space if (i !== length - 1) { -- cgit v1.2.3-1-g7c22 From 196fef3a1bca7d2d4fbb07e6134c1de2a4338a97 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Mon, 31 Dec 2018 00:45:11 +0100 Subject: Added popup --- client/lib/popup.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'client/lib') diff --git a/client/lib/popup.js b/client/lib/popup.js index 516ce849..5b640f50 100644 --- a/client/lib/popup.js +++ b/client/lib/popup.js @@ -27,11 +27,9 @@ window.Popup = new class { open(name) { const self = this; const popupName = `${name}Popup`; - function clickFromPopup(evt) { return $(evt.target).closest('.js-pop-over').length !== 0; } - return function(evt) { // If a popup is already opened, clicking again on the opener element // should close it -- and interrupt the current `open` function. @@ -57,7 +55,6 @@ window.Popup = new class { self._stack = []; openerElement = evt.currentTarget; } - $(openerElement).addClass('is-active'); evt.preventDefault(); @@ -139,6 +136,7 @@ window.Popup = new class { const openerElement = this._getTopStack().openerElement; $(openerElement).removeClass('is-active'); + this._stack = []; } } @@ -200,7 +198,7 @@ escapeActions.forEach((actionName) => { () => Popup[actionName](), () => Popup.isOpen(), { - noClickEscapeOn: '.js-pop-over', + noClickEscapeOn: '.js-pop-over,.js-open-card-title-popup', enabledOnClick: actionName === 'close', } ); -- cgit v1.2.3-1-g7c22 From 4d8b2029d266843dc0eb376a0bf752c46e440a13 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Wed, 2 Jan 2019 22:51:00 +0100 Subject: Fixed errors --- client/lib/utils.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'client/lib') diff --git a/client/lib/utils.js b/client/lib/utils.js index f252a220..051ec952 100644 --- a/client/lib/utils.js +++ b/client/lib/utils.js @@ -220,19 +220,19 @@ Utils = { finalString += element.text().toLowerCase(); } else if (element.hasClass('user-details')) { let username = element.find('input').val(); - if(username == undefined || username == ""){ - username = "*"; + if(username == undefined || username == ''){ + username = '*'; } - finalString += element.find('.trigger-text').text().toLowerCase()+ " " + username ; + finalString += `${element.find('.trigger-text').text().toLowerCase() } ${ username}`; } else if (element.find('select').length > 0) { finalString += element.find('select option:selected').text().toLowerCase(); } else if (element.find('input').length > 0) { let inputvalue = element.find('input').val(); - if(inputvalue == undefined || inputvalue == ""){ - inputvalue = "*"; + if(inputvalue == undefined || inputvalue == ''){ + inputvalue = '*'; } finalString += inputvalue; - } + } // Add space if (i !== length - 1) { finalString += ' '; -- cgit v1.2.3-1-g7c22