diff options
Diffstat (limited to 'client/components')
| -rw-r--r-- | client/components/activities/comments.js | 3 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.js | 6 | ||||
| -rw-r--r-- | client/components/cards/minicard.jade | 13 | ||||
| -rw-r--r-- | client/components/users/userHeader.js | 34 |
4 files changed, 25 insertions, 31 deletions
diff --git a/client/components/activities/comments.js b/client/components/activities/comments.js index 95084646..50ca019b 100644 --- a/client/components/activities/comments.js +++ b/client/components/activities/comments.js @@ -16,9 +16,6 @@ BlazeComponent.extendComponent({ events() { return [ { - 'click .js-new-comment:not(.focus)'() { - commentFormIsOpen.set(true); - }, 'submit .js-new-comment-form'(evt) { const input = this.getInput(); const text = input.val().trim(); diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 7bb54223..67120043 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -291,6 +291,8 @@ BlazeComponent.extendComponent({ .trim(); if (title) { this.data().setTitle(title); + } else { + this.data().setTitle(''); } }, 'submit .js-card-details-assigner'(event) { @@ -300,6 +302,8 @@ BlazeComponent.extendComponent({ .trim(); if (assigner) { this.data().setAssignedBy(assigner); + } else { + this.data().setAssignedBy(''); } }, 'submit .js-card-details-requester'(event) { @@ -309,6 +313,8 @@ BlazeComponent.extendComponent({ .trim(); if (requester) { this.data().setRequestedBy(requester); + } else { + this.data().setRequestedBy(''); } }, 'click .js-member': Popup.open('cardMember'), diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 79672f8c..7dd220ee 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -67,14 +67,15 @@ template(name="minicard") .minicard-custom-fields each customFieldsWD if definition.showOnCard - .minicard-custom-field - if definition.showLabelOnMiniCard + if trueValue + .minicard-custom-field + if definition.showLabelOnMiniCard + .minicard-custom-field-item + +viewer + = definition.name .minicard-custom-field-item +viewer - = definition.name - .minicard-custom-field-item - +viewer - = trueValue + = trueValue if getAssignees .minicard-assignees.js-minicard-assignees diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index e0c6218e..5f36ef54 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -180,24 +180,20 @@ Template.changeSettingsPopup.helpers({ currentUser = Meteor.user(); if (currentUser) { return (currentUser.profile || {}).showDesktopDragHandles; + } else if (cookies.has('showDesktopDragHandles')) { + return true; } else { - if (cookies.has('showDesktopDragHandles')) { - return true; - } else { - return false; - } + return false; } }, hiddenSystemMessages() { currentUser = Meteor.user(); if (currentUser) { return (currentUser.profile || {}).hasHiddenSystemMessages; + } else if (cookies.has('hasHiddenSystemMessages')) { + return true; } else { - if (cookies.has('hasHiddenSystemMessages')) { - return true; - } else { - return false; - } + return false; } }, showCardsCountAt() { @@ -205,8 +201,6 @@ Template.changeSettingsPopup.helpers({ if (currentUser) { return Meteor.user().getLimitToShowCardsCount(); } else { - import { Cookies } from 'meteor/ostrio:cookies'; - const cookies = new Cookies(); return cookies.get('limitToShowCardsCount'); } }, @@ -217,24 +211,20 @@ Template.changeSettingsPopup.events({ currentUser = Meteor.user(); if (currentUser) { Meteor.call('toggleDesktopDragHandles'); + } else if (cookies.has('showDesktopDragHandles')) { + cookies.remove('showDesktopDragHandles'); } else { - if (cookies.has('showDesktopDragHandles')) { - cookies.remove('showDesktopDragHandles'); - } else { - cookies.set('showDesktopDragHandles', 'true'); - } + cookies.set('showDesktopDragHandles', 'true'); } }, 'click .js-toggle-system-messages'() { currentUser = Meteor.user(); if (currentUser) { Meteor.call('toggleSystemMessages'); + } else if (cookies.has('hasHiddenSystemMessages')) { + cookies.remove('hasHiddenSystemMessages'); } else { - if (cookies.has('hasHiddenSystemMessages')) { - cookies.remove('hasHiddenSystemMessages'); - } else { - cookies.set('hasHiddenSystemMessages', 'true'); - } + cookies.set('hasHiddenSystemMessages', 'true'); } }, 'click .js-apply-show-cards-at'(event, templateInstance) { |