diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-01-25 22:20:00 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-01-25 22:20:00 +0200 |
| commit | 95c178cee32d0c5a782ba0f39d717c1446eee22d (patch) | |
| tree | 0e623b7087de42140cd12aeceb32a5ba85425649 /client/components/cards/cardDetails.js | |
| parent | 46a468b06dd5d4ca2338140bb2fd32958ccef85f (diff) | |
| parent | be8f00ab8af080790758362d43c9efea2ed1b2eb (diff) | |
| download | wekan-95c178cee32d0c5a782ba0f39d717c1446eee22d.tar.gz wekan-95c178cee32d0c5a782ba0f39d717c1446eee22d.tar.bz2 wekan-95c178cee32d0c5a782ba0f39d717c1446eee22d.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components/cards/cardDetails.js')
| -rw-r--r-- | client/components/cards/cardDetails.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index cc04b830..79a686a7 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -27,7 +27,6 @@ BlazeComponent.extendComponent({ onCreated() { this.currentBoard = Boards.findOne(Session.get('currentBoard')); this.isLoaded = new ReactiveVar(false); - this.currentColor = new ReactiveVar(this.data().color); const boardBody = this.parentComponent().parentComponent(); //in Miniview parent is Board, not BoardBody. if (boardBody !== null) { @@ -601,6 +600,9 @@ BlazeComponent.extendComponent({ }, isSelected(color) { + if (this.currentColor.get() === null) { + return color === 'white'; + } return this.currentColor.get() === color; }, |