diff options
| -rw-r--r-- | client/components/rules/rules.styl | 9 | ||||
| -rw-r--r-- | client/components/rules/rulesMain.jade | 8 | ||||
| -rw-r--r-- | client/components/rules/rulesMain.js | 1 | ||||
| -rw-r--r-- | client/components/rules/triggers/boardTriggers.jade | 2 | ||||
| -rw-r--r-- | client/lib/popup.js | 6 | ||||
| -rw-r--r-- | i18n/en.i18n.json | 1 |
6 files changed, 22 insertions, 5 deletions
diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl index 4679e039..27463d12 100644 --- a/client/components/rules/rules.styl +++ b/client/components/rules/rules.styl @@ -123,6 +123,15 @@ .trigger-text font-size: 16px display:inline-block + .trigger-inline-button + font-size: 16px + display: inline; + padding: 6px; + border: 1px solid #eee + border-radius: 4px + box-shadow: inset -1px -1px 3px rgba(0,0,0,.05) + &:hover, &.is-active + box-shadow: 0 0 0 2px darken(white, 60%) inset .trigger-text.trigger-text-email margin-left: 5px; margin-top: 10px; diff --git a/client/components/rules/rulesMain.jade b/client/components/rules/rulesMain.jade index dc33ee4e..d01d9f77 100644 --- a/client/components/rules/rulesMain.jade +++ b/client/components/rules/rulesMain.jade @@ -6,4 +6,10 @@ template(name="rulesMain") if($eq rulesCurrentTab.get 'action') +rulesActions(ruleName=ruleName triggerVar=triggerVar) if($eq rulesCurrentTab.get 'ruleDetails') - +ruleDetails(ruleId=ruleId)
\ No newline at end of file + +ruleDetails(ruleId=ruleId) + +template(name="boardCardTitlePopup") + form + label + | Card Title Filter + input.js-board-name(type="text" value=title autofocus)
\ No newline at end of file diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 566fd3e5..373c7502 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -31,6 +31,7 @@ BlazeComponent.extendComponent({ Triggers.remove(rule.triggerId); }, + 'click .js-open-card-title-popup': Popup.open('boardCardTitle'), 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index abf2ee6d..f8767974 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -21,6 +21,8 @@ template(name="boardTriggers") div.trigger-content div.trigger-text | {{_'r-when-a-card-is'}} + div.trigger-inline-button.js-open-card-title-popup + i.fa.fa-filter div.trigger-text | {{_'r-added-to'}} div.trigger-text 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', } ); diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index d4745b22..1007a650 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -467,6 +467,7 @@ "error-notAuthorized": "You are not authorized to view this page.", "outgoing-webhooks": "Outgoing Webhooks", "outgoingWebhooksPopup-title": "Outgoing Webhooks", + "boardCardTitlePopup-title": "Card Title Filter", "new-outgoing-webhook": "New Outgoing Webhook", "no-name": "(Unknown)", "Node_version": "Node version", |