Merge branch 'mario-orlicky-devel' into devel

Added plus button to add card on top of the list.
Thanks to mario-orlicky ! Closes #1233

1 files changed, 7 insertions, 8 deletions

diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js
index 1ad9f9dd..7fe42884 100644
--- a/client/components/lists/listHeader.js
+++ b/client/components/lists/listHeader.js
@@ -24,6 +24,13 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       'click .js-open-list-menu': Popup.open('listAction'),
+      'click .js-add-card' () {
+        const listDom = document.getElementById(`js-list-${this.currentData()._id}`);
+        const listComponent = BlazeComponent.getComponentForElement(listDom);
+        listComponent.openForm({
+          position: 'top',
+        });
+      },
       submit: this.editTitle,
     }];
   },
@@ -36,14 +43,6 @@ Template.listActionPopup.helpers({
 });
 
 Template.listActionPopup.events({
-  'click .js-add-card' () {
-    const listDom = document.getElementById(`js-list-${this._id}`);
-    const listComponent = BlazeComponent.getComponentForElement(listDom);
-    listComponent.openForm({
-      position: 'top',
-    });
-    Popup.close();
-  },
   'click .js-list-subscribe' () {},
   'click .js-select-cards' () {
     const cardIds = this.allCards().map((card) => card._id);