Merge branch 'devel'

5 files changed, 18 insertions, 11 deletions

diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade
index c8442691..0f79323b 100644
--- a/client/components/cards/attachments.jade
+++ b/client/components/cards/attachments.jade
@@ -21,8 +21,8 @@ template(name="attachmentDeletePopup")
 template(name="attachmentsGalery")
   .attachments-galery
     each attachments
-      a.attachment-item.swipebox(href="{{url}}" title="{{name}}")
-        .attachment-thumbnail
+      .attachment-item
+        a.attachment-thumbnail.swipebox(href="{{url}}" title="{{name}}")
           if isUploaded
             if isImage
               img.attachment-thumbnail-img(src="{{url}}")
diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index 36e8a5ec..b1f88bf1 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -60,7 +60,13 @@ Template.cardAttachmentsPopup.events({
       file.boardId = card.boardId;
       file.cardId = card._id;
       file.userId = Meteor.userId();
-      Attachments.insert(file);
+
+      const attachment = Attachments.insert(file);
+
+      if (attachment && attachment._id && attachment.isImage()) {
+        card.setCover(attachment._id);
+      }
+
       Popup.close();
     });
   },
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 4c68c2f7..0a7a8cd6 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -85,13 +85,12 @@ template(name="cardDetails")
     hr
     +checklists(cardId = _id)
 
-    if attachments.count
-      hr
-      h2
-        i.fa.fa-paperclip
-        | {{_ 'attachments'}}
+    hr
+    h2
+      i.fa.fa-paperclip
+      | {{_ 'attachments'}}
 
-      +attachmentsGalery
+    +attachmentsGalery
 
     hr
     .activity-title
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index b62f31d4..f4e6e773 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -23,6 +23,8 @@ BlazeComponent.extendComponent({
     this.parentComponent().showOverlay.set(true);
     this.parentComponent().mouseHasEnterCardDetails = false;
     this.calculateNextPeak();
+
+    Meteor.subscribe('unsaved-edits');
   },
 
   isWatching() {
diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js
index d3a946f0..5c0e3d2e 100644
--- a/client/components/cards/checklists.js
+++ b/client/components/cards/checklists.js
@@ -181,8 +181,8 @@ BlazeComponent.extendComponent({
 Template.checklistDeleteDialog.onCreated(() => {
   const $cardDetails = this.$('.card-details');
   this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position
-                       top: false, //required for smooth scroll animation
-                     };
+    top: false, //required for smooth scroll animation
+  };
   //Callback's purpose is to only prevent scrolling after animation is complete
   $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; });