From ebd884e654c45373dc56a03730a4ce670887ce8b Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 7 Oct 2018 17:27:26 +0200 Subject: Fixed lint errors --- client/components/rules/rulesMain.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/rules/rulesMain.js') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 65cc3d98..e0171b56 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -24,7 +24,7 @@ BlazeComponent.extendComponent({ events() { return [{ - 'click .js-delete-rule' (event) { + 'click .js-delete-rule' () { const rule = this.currentData(); Rules.remove(rule._id); Actions.remove(rule.actionId); -- cgit v1.2.3-1-g7c22 From f19948f9936af6656d70ba629d56cbf40de77b2a Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 7 Oct 2018 17:47:01 +0200 Subject: Added back button --- client/components/rules/rulesMain.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'client/components/rules/rulesMain.js') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index e0171b56..feb46d74 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -46,6 +46,15 @@ BlazeComponent.extendComponent({ event.preventDefault(); this.setRulesList(); }, + 'click .js-goback' (event) { + event.preventDefault(); + if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){ + this.setRulesList(); + } + if(this.rulesCurrentTab.get() === 'action'){ + this.setTrigger(); + } + }, 'click .js-goto-details' (event) { event.preventDefault(); const rule = this.currentData(); -- cgit v1.2.3-1-g7c22 From 6931b88e4013754a7b03205a9916b9e607224f48 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 7 Oct 2018 18:19:51 +0200 Subject: Prevent rules with no name --- client/components/rules/rulesMain.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'client/components/rules/rulesMain.js') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index feb46d74..3e871c69 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -34,9 +34,11 @@ BlazeComponent.extendComponent({ 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; - this.find('#ruleTitle').value = ''; - this.ruleName.set(ruleTitle); - this.setTrigger(); + if(ruleTitle != undefined && ruleTitle != ''){ + this.find('#ruleTitle').value = ''; + this.ruleName.set(ruleTitle); + this.setTrigger(); + } }, 'click .js-goto-action' (event) { event.preventDefault(); -- cgit v1.2.3-1-g7c22 From 58855ada97677d25475ba4721834c0f576ed3b47 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 8 Oct 2018 00:44:02 +0300 Subject: - Fix lint errors and warnings. Thanks to xet7 ! --- client/components/rules/rulesMain.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/rules/rulesMain.js') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 3e871c69..0752a541 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -34,7 +34,7 @@ BlazeComponent.extendComponent({ 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; - if(ruleTitle != undefined && ruleTitle != ''){ + if(ruleTitle !== undefined && ruleTitle !== ''){ this.find('#ruleTitle').value = ''; this.ruleName.set(ruleTitle); this.setTrigger(); -- cgit v1.2.3-1-g7c22