Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix comment text disappearing when clicking outside of comment text area.

Browse source 
Fix lint error.

Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2019-12-17 23:42:30 +02:00
parent a4dbe98299
commit 3b3950369c
2 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/components/activities/comments.js
View file

@ -16,9 +16,6 @@ BlazeComponent.extendComponent({
events() { events() {
return [ return [
{ {
'click .js-new-comment:not(.focus)'() {
commentFormIsOpen.set(true);
},
'submit .js-new-comment-form'(evt) { 'submit .js-new-comment-form'(evt) {
const input = this.getInput(); const input = this.getInput();
const text = input.val().trim(); const text = input.val().trim();

34
client/components/users/userHeader.js
View file

@ -180,24 +180,20 @@ Template.changeSettingsPopup.helpers({
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
return (currentUser.profile || {}).showDesktopDragHandles; return (currentUser.profile || {}).showDesktopDragHandles;
} else if (cookies.has('showDesktopDragHandles')) {
return true;
} else { } else {
if (cookies.has('showDesktopDragHandles')) { return false;
return true;
} else {
return false;
}
} }
}, },
hiddenSystemMessages() { hiddenSystemMessages() {
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
return (currentUser.profile || {}).hasHiddenSystemMessages; return (currentUser.profile || {}).hasHiddenSystemMessages;
} else if (cookies.has('hasHiddenSystemMessages')) {
return true;
} else { } else {
if (cookies.has('hasHiddenSystemMessages')) { return false;
return true;
} else {
return false;
}
} }
}, },
showCardsCountAt() { showCardsCountAt() {
@ -205,8 +201,6 @@ Template.changeSettingsPopup.helpers({
if (currentUser) { if (currentUser) {
return Meteor.user().getLimitToShowCardsCount(); return Meteor.user().getLimitToShowCardsCount();
} else { } else {
import { Cookies } from 'meteor/ostrio:cookies';
const cookies = new Cookies();
return cookies.get('limitToShowCardsCount'); return cookies.get('limitToShowCardsCount');
} }
}, },
@ -217,24 +211,20 @@ Template.changeSettingsPopup.events({
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
Meteor.call('toggleDesktopDragHandles'); Meteor.call('toggleDesktopDragHandles');
} else if (cookies.has('showDesktopDragHandles')) {
cookies.remove('showDesktopDragHandles');
} else { } else {
if (cookies.has('showDesktopDragHandles')) { cookies.set('showDesktopDragHandles', 'true');
cookies.remove('showDesktopDragHandles');
} else {
cookies.set('showDesktopDragHandles', 'true');
}
} }
}, },
'click .js-toggle-system-messages'() { 'click .js-toggle-system-messages'() {
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
Meteor.call('toggleSystemMessages'); Meteor.call('toggleSystemMessages');
} else if (cookies.has('hasHiddenSystemMessages')) {
cookies.remove('hasHiddenSystemMessages');
} else { } else {
if (cookies.has('hasHiddenSystemMessages')) { cookies.set('hasHiddenSystemMessages', 'true');
cookies.remove('hasHiddenSystemMessages');
} else {
cookies.set('hasHiddenSystemMessages', 'true');
}
} }
}, },
'click .js-apply-show-cards-at'(event, templateInstance) { 'click .js-apply-show-cards-at'(event, templateInstance) {