diff options
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/activities/activities.styl | 2 | ||||
-rw-r--r-- | client/components/boards/boardsList.js | 2 | ||||
-rw-r--r-- | client/components/cards/attachments.jade | 4 | ||||
-rw-r--r-- | client/components/cards/attachments.js | 8 | ||||
-rw-r--r-- | client/components/cards/checklists.js | 4 | ||||
-rwxr-xr-x | client/components/main/editor.js | 2 | ||||
-rw-r--r-- | client/components/main/header.js | 1 | ||||
-rw-r--r-- | client/components/settings/settingBody.js | 2 |
8 files changed, 16 insertions, 9 deletions
diff --git a/client/components/activities/activities.styl b/client/components/activities/activities.styl index 918b1fce..380e7b40 100644 --- a/client/components/activities/activities.styl +++ b/client/components/activities/activities.styl @@ -23,6 +23,8 @@ align-self: center margin: 0 margin-left: 3px + overflow: hidden; + word-break: break-word; .activity-comment display: block diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index cc4e2f87..1ed88146 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -2,8 +2,6 @@ const subManager = new SubsManager(); BlazeComponent.extendComponent({ onCreated() { - // Here is the only place that boards data needed, all boards data will stop sync when leaving this template. - Meteor.subscribe('boards'); Meteor.subscribe('setting'); }, 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/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; }); diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 5987b772..5f384ece 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -6,7 +6,7 @@ Template.editor.onRendered(() => { $textarea.escapeableTextComplete([ // Emoji { - match: /\B:([\-+\w]*)$/, + match: /\B:([-+\w]*)$/, search(term, callback) { callback(Emoji.values.map((emoji) => { return emoji.includes(term) ? emoji : null; diff --git a/client/components/main/header.js b/client/components/main/header.js index 3155b3d9..7fbc5716 100644 --- a/client/components/main/header.js +++ b/client/components/main/header.js @@ -1,4 +1,5 @@ Meteor.subscribe('user-admin'); +Meteor.subscribe('boards'); Template.header.helpers({ wrappedHeader() { diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index fabcc70c..8c1ff1c7 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -116,7 +116,7 @@ BlazeComponent.extendComponent({ const from = this.checkField('#mail-server-from'); const tls = $('#mail-server-tls.is-checked').length > 0; Settings.update(Settings.findOne()._id, {$set:{'mailServer.host':host, 'mailServer.port': port, 'mailServer.username': username, - 'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from}}); + 'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from}}); } catch (e) { return; } finally { |