summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/components/rules/actions/cardActions.jade6
-rw-r--r--client/components/rules/actions/cardActions.js24
-rw-r--r--client/components/swimlanes/swimlanes.styl1
3 files changed, 18 insertions, 13 deletions
diff --git a/client/components/rules/actions/cardActions.jade b/client/components/rules/actions/cardActions.jade
index 1fee5231..8c6defc6 100644
--- a/client/components/rules/actions/cardActions.jade
+++ b/client/components/rules/actions/cardActions.jade
@@ -39,8 +39,10 @@ template(name="cardActions")
div.trigger-content
div.trigger-text
| {{{_'r-set-color'}}}
- button.trigger-button.trigger-button-color.card-details-green.js-show-color-palette(id="color-action")
- | {{{_'color-green'}}}
+ button.trigger-button.trigger-button-color.js-show-color-palette(
+ id="color-action"
+ class="card-details-{{cardColorButton}}")
+ | {{{_ cardColorButtonText }}}
div.trigger-button.js-set-color-action.js-goto-rules
i.fa.fa-plus
diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js
index 6c858358..a1e43c38 100644
--- a/client/components/rules/actions/cardActions.js
+++ b/client/components/rules/actions/cardActions.js
@@ -6,6 +6,15 @@ Meteor.startup(() => {
BlazeComponent.extendComponent({
onCreated() {
this.subscribe('allRules');
+ this.cardColorButtonValue = new ReactiveVar('green');
+ },
+
+ cardColorButton() {
+ return this.cardColorButtonValue.get();
+ },
+
+ cardColorButtonText() {
+ return `color-${ this.cardColorButtonValue.get() }`;
},
labels() {
@@ -128,11 +137,7 @@ BlazeComponent.extendComponent({
'click .js-set-color-action' (event) {
const ruleName = this.data().ruleName.get();
const trigger = this.data().triggerVar.get();
- const colorButton = this.find('#color-action');
- if (colorButton.value === '') {
- colorButton.value = 'green';
- }
- const selectedColor = colorButton.value;
+ const selectedColor = this.cardColorButtonValue.get();
const boardId = Session.get('currentBoard');
const desc = Utils.getTriggerActionDesc(event, this);
const triggerId = Triggers.insert(trigger);
@@ -157,8 +162,8 @@ BlazeComponent.extendComponent({
BlazeComponent.extendComponent({
onCreated() {
this.currentAction = this.currentData();
- this.colorButton = Popup.getOpenerComponent().find('#color-action');
- this.currentColor = new ReactiveVar(this.colorButton.value);
+ this.colorButtonValue = Popup.getOpenerComponent().cardColorButtonValue;
+ this.currentColor = new ReactiveVar(this.colorButtonValue.get());
},
colors() {
@@ -175,10 +180,7 @@ BlazeComponent.extendComponent({
this.currentColor.set(this.currentData().color);
},
'click .js-submit' () {
- this.colorButton.classList.remove(`card-details-${ this.colorButton.value }`);
- this.colorButton.value = this.currentColor.get();
- this.colorButton.innerText = `${TAPi18n.__(`color-${ this.currentColor.get() }`)}`;
- this.colorButton.classList.add(`card-details-${ this.colorButton.value }`);
+ this.colorButtonValue.set(this.currentColor.get());
Popup.close();
},
}];
diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl
index e4e2cd3b..19613ad9 100644
--- a/client/components/swimlanes/swimlanes.styl
+++ b/client/components/swimlanes/swimlanes.styl
@@ -53,6 +53,7 @@
.list-group
flex-direction: row
height: 100%
+ overflow: hidden
swimlane-color(background, color...)
background: background !important