diff options
Diffstat (limited to 'client/components/lists')
-rw-r--r-- | client/components/lists/list.js | 2 | ||||
-rw-r--r-- | client/components/lists/listHeader.jade | 7 | ||||
-rw-r--r-- | client/components/lists/listHeader.js | 14 |
3 files changed, 22 insertions, 1 deletions
diff --git a/client/components/lists/list.js b/client/components/lists/list.js index e1909783..187d8ec3 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -44,7 +44,7 @@ BlazeComponent.extendComponent({ placeholder: 'minicard-wrapper placeholder', start(evt, ui) { ui.placeholder.height(ui.helper.height()); - EscapeActions.executeUpTo('popup'); + EscapeActions.executeUpTo('popup-close'); boardComponent.setIsDragging(true); }, stop(evt, ui) { diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index f9fe065f..29aa4282 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -6,6 +6,10 @@ template(name="listHeader") h2.list-header-name( class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}") = title + if showCardsCountForList cards.count + = cards.count + span.lowercase + | {{_ 'cards'}} if currentUser.isBoardMember if isWatching i.list-header-watch-icon.fa.fa-eye @@ -29,6 +33,9 @@ template(name="listActionPopup") hr ul.pop-over-list li: a.js-close-list {{_ 'archive-list'}} + hr + ul.pop-over-list + li: a.js-remove-list {{_ 'remove-list'}} template(name="boardLists") ul.pop-over-list diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index c7ae8e62..f352022d 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -13,6 +13,14 @@ BlazeComponent.extendComponent({ return list.findWatcher(Meteor.userId()); }, + limitToShowCardsCount() { + return Meteor.user().getLimitToShowCardsCount(); + }, + + showCardsCountForList(count) { + return count > this.limitToShowCardsCount(); + }, + events() { return [{ 'click .js-open-list-menu': Popup.open('listAction'), @@ -52,4 +60,10 @@ Template.listActionPopup.events({ this.archive(); Popup.close(); }, + 'click .js-remove-list'(evt) { + const currentList = this; + evt.preventDefault(); + Lists.remove(currentList._id); + Popup.close(); + }, }); |