From b79fc532655ee1e3f3c9fa8a37a84c6fd1686fa3 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Sat, 6 Feb 2021 15:25:10 +0100 Subject: [PATCH 1/3] Settings, "Show cards count" keyboard input possible --- client/components/users/userHeader.jade | 2 +- client/components/users/userHeader.js | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index d3ef6e3ff..c3e7b7e35 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -143,7 +143,7 @@ template(name="changeSettingsPopup") label.bold.clear i.fa.fa-sort-numeric-asc | {{_ 'show-cards-minimum-count'}} - input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false") + input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99") label.bold.clear i.fa.fa-calendar | {{_ 'start-day-of-week'}} diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 2ef316990..9a840b649 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -271,6 +271,13 @@ Template.changeSettingsPopup.helpers({ }); Template.changeSettingsPopup.events({ + 'keypress/paste #show-cards-count-at'() { + let keyCode = event.keyCode; + let charCode = String.fromCharCode(keyCode); + let regex = new RegExp("[0-9]"); + let ret = regex.test(charCode); + return ret; + }, 'click .js-toggle-desktop-drag-handles'() { currentUser = Meteor.user(); if (currentUser) { @@ -293,7 +300,7 @@ Template.changeSettingsPopup.events({ }, 'click .js-apply-user-settings'(event, templateInstance) { event.preventDefault(); - const minLimit = parseInt( + let minLimit = parseInt( templateInstance.$('#show-cards-count-at').val(), 10, ); @@ -302,6 +309,9 @@ Template.changeSettingsPopup.events({ 10, ); const currentUser = Meteor.user(); + if (isNaN(minLimit)) { + minLimit = 0; + } if (!isNaN(minLimit)) { if (currentUser) { Meteor.call('changeLimitToShowCardsCount', minLimit); From 40907ef1d8203a4d0dd102dba2ee2b7a64dfd783 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Sat, 6 Feb 2021 15:26:15 +0100 Subject: [PATCH 2/3] Settings, "Show cards count" max value now endless - there could be users who want to enter moren than 99 --- client/components/users/userHeader.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index c3e7b7e35..50253588f 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -143,7 +143,7 @@ template(name="changeSettingsPopup") label.bold.clear i.fa.fa-sort-numeric-asc | {{_ 'show-cards-minimum-count'}} - input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99") + input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0") label.bold.clear i.fa.fa-calendar | {{_ 'start-day-of-week'}} From 8475201db8e92c648b35396c8d4b5aff98972d21 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Sat, 6 Feb 2021 15:44:18 +0100 Subject: [PATCH 3/3] Settings, "Show cards count" now shows also 1 card --- client/components/lists/listHeader.js | 2 +- client/components/users/userHeader.jade | 2 +- client/components/users/userHeader.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 9edc9283e..8fa8bfd0d 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -82,7 +82,7 @@ BlazeComponent.extendComponent({ showCardsCountForList(count) { const limit = this.limitToShowCardsCount(); - return limit > 0 && count > limit; + return limit >= 0 && count > limit; }, events() { diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 50253588f..e095e5d3b 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -143,7 +143,7 @@ template(name="changeSettingsPopup") label.bold.clear i.fa.fa-sort-numeric-asc | {{_ 'show-cards-minimum-count'}} - input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0") + input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="-1") label.bold.clear i.fa.fa-calendar | {{_ 'start-day-of-week'}} diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 9a840b649..59c12d1a6 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -274,7 +274,7 @@ Template.changeSettingsPopup.events({ 'keypress/paste #show-cards-count-at'() { let keyCode = event.keyCode; let charCode = String.fromCharCode(keyCode); - let regex = new RegExp("[0-9]"); + let regex = new RegExp("[-0-9]"); let ret = regex.test(charCode); return ret; }, @@ -309,8 +309,8 @@ Template.changeSettingsPopup.events({ 10, ); const currentUser = Meteor.user(); - if (isNaN(minLimit)) { - minLimit = 0; + if (isNaN(minLimit) || minLimit < -1) { + minLimit = -1; } if (!isNaN(minLimit)) { if (currentUser) {