diff options
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/lists/listHeader.jade | 9 | ||||
-rw-r--r-- | client/components/lists/listHeader.js | 19 | ||||
-rw-r--r-- | client/components/sidebar/sidebarFilters.js | 1 |
3 files changed, 1 insertions, 28 deletions
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 72cd0fe9..750cf3a2 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -21,16 +21,11 @@ template(name="listActionPopup") li: a.js-add-card {{_ 'add-card'}} if cards.count li: a.js-select-cards {{_ 'list-select-cards'}} - li: a.js-move-cards {{_ 'list-move-cards'}} - li: a.js-archive-cards {{_ 'list-archive-cards'}} hr ul.pop-over-list li: a.js-import-card {{_ 'import-card'}} li: a.js-close-list {{_ 'archive-list'}} -template(name="listMoveCardsPopup") - +boardLists - template(name="boardLists") ul.pop-over-list each currentBoard.lists @@ -39,7 +34,3 @@ template(name="boardLists") a.disabled {{title}} ({{_ 'current'}}) else a.js-select-list= title - -template(name="listArchiveCardsPopup") - p {{_ 'list-archive-cards-pop'}} - input.js-confirm.negate.full(type="submit" value="{{_ 'archive-all'}}") diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index d660508a..5b7c5713 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -34,28 +34,9 @@ Template.listActionPopup.events({ Popup.close(); }, 'click .js-import-card': Popup.open('listImportCard'), - 'click .js-move-cards': Popup.open('listMoveCards'), - 'click .js-archive-cards': Popup.afterConfirm('listArchiveCards', function() { - this.allCards().forEach((card) => { - card.archive(); - }); - Popup.close(); - }), - 'click .js-close-list'(evt) { evt.preventDefault(); this.archive(); Popup.close(); }, }); - -Template.listMoveCardsPopup.events({ - 'click .js-select-list'() { - const fromList = Template.parentData(2).data; - const toList = this._id; - fromList.allCards().forEach((card) => { - card.move(toList); - }); - Popup.close(); - }, -}); diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js index bdecd63e..50e76200 100644 --- a/client/components/sidebar/sidebarFilters.js +++ b/client/components/sidebar/sidebarFilters.js @@ -95,6 +95,7 @@ BlazeComponent.extendComponent({ }, 'click .js-archive-selection'() { mutateSelectedCards('archive'); + EscapeActions.executeUpTo('multiselection'); }, }]; }, |