diff options
author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-23 16:56:55 +0200 |
---|---|---|
committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-23 16:56:55 +0200 |
commit | 31b60d82fcae64a844805a2a76a0af25fb9c16c2 (patch) | |
tree | a82d7d6e6097f67215406ea47a11671292a4dc7b /client/components/activities | |
parent | b3696e1e3b366770af8c41861b5cf996cdd2378a (diff) | |
download | wekan-31b60d82fcae64a844805a2a76a0af25fb9c16c2.tar.gz wekan-31b60d82fcae64a844805a2a76a0af25fb9c16c2.tar.bz2 wekan-31b60d82fcae64a844805a2a76a0af25fb9c16c2.zip |
Upgrade Meteor to 1.2.1-rc4
This version includes a more complete selection of ES2015 polyfills
that I started used across the code base, for instance by replacing
`$.trim(str)` by `str.trim()`.
Diffstat (limited to 'client/components/activities')
-rw-r--r-- | client/components/activities/activities.js | 4 | ||||
-rw-r--r-- | client/components/activities/comments.js | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index a491c2e8..64e9865d 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -101,9 +101,9 @@ BlazeComponent.extendComponent({ }, 'submit .js-edit-comment'(evt) { evt.preventDefault(); - const commentText = this.currentComponent().getValue(); + const commentText = this.currentComponent().getValue().trim(); const commentId = Template.parentData().commentId; - if ($.trim(commentText)) { + if (commentText) { CardComments.update(commentId, { $set: { text: commentText, diff --git a/client/components/activities/comments.js b/client/components/activities/comments.js index 08401caa..f9bbcff8 100644 --- a/client/components/activities/comments.js +++ b/client/components/activities/comments.js @@ -23,12 +23,13 @@ BlazeComponent.extendComponent({ commentFormIsOpen.set(true); }, 'submit .js-new-comment-form'(evt) { - const input = this.getInput(); - if ($.trim(input.val())) { + const input = this.getInput() + const text = input.val().trim(); + if (text) { CardComments.insert({ + text, boardId: this.currentData().boardId, cardId: this.currentData()._id, - text: input.val(), }); resetCommentInput(input); Tracker.flush(); @@ -72,8 +73,9 @@ EscapeActions.register('inlinedForm', docId: Session.get('currentCard'), }; const commentInput = $('.js-new-comment-input'); - if ($.trim(commentInput.val())) { - UnsavedEdits.set(draftKey, commentInput.val()); + const draft = commentInput.val().trim(); + if (draft) { + UnsavedEdits.set(draftKey, draft); } else { UnsavedEdits.reset(draftKey); } |