diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 7 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.js | 3 | ||||
| -rw-r--r-- | client/components/cards/checklists.jade | 16 | ||||
| -rw-r--r-- | client/components/cards/checklists.js | 5 | ||||
| -rw-r--r-- | client/components/cards/minicard.jade | 4 |
5 files changed, 24 insertions, 11 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index ce93d6fd..b6572251 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -9,9 +9,10 @@ template(name="cardDetails") a.fa.fa-navicon.card-details-menu.js-open-card-details-menu h2.card-details-title.js-card-title( class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}") - = title - if isWatching - i.fa.fa-eye.card-details-watch + +viewer + = title + if isWatching + i.fa.fa-eye.card-details-watch if archived p.warning {{_ 'card-archived'}} diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 836a2353..3825bda8 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -197,7 +197,8 @@ Template.editCardTitleForm.onRendered(function () { Template.editCardTitleForm.events({ 'keydown .js-edit-card-title' (evt) { // If enter key was pressed, submit the data - if (evt.keyCode === 13) { + // Unless the shift key is also being pressed + if (evt.keyCode === 13 && !event.shiftKey) { $('.js-submit-edit-card-title-form').click(); } }, diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 9ff52d8e..42fe3bd4 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -28,9 +28,13 @@ template(name="checklistDetail") span.checklist-stat(class="{{#if checklist.isFinished}}is-finished{{/if}}") {{checklist.finishedCount}}/{{checklist.itemCount}} if canModifyCard - h2.title.js-open-inlined-form.is-editable {{checklist.title}} + h2.title.js-open-inlined-form.is-editable + +viewer + = checklist.title else - h2.title {{checklist.title}} + h2.title + +viewer + = checklist.title +checklistItems(checklist = checklist) template(name="checklistDeleteDialog") @@ -83,7 +87,11 @@ template(name='itemDetail') .item.js-checklist-item if canModifyCard .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}") - .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}") {{item.title}} + .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}") + +viewer + = item.title else .materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}") - .item-title(class="{{#if item.isFinished }}is-checked{{/if}}") {{item.title}} + .item-title(class="{{#if item.isFinished }}is-checked{{/if}}") + +viewer + = item.title diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 1cd77c9f..d3a946f0 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -146,8 +146,9 @@ BlazeComponent.extendComponent({ }, pressKey(event) { - //If user press enter key inside a form, submit it, so user doesn't have to leave keyboard to submit a form. - if (event.keyCode === 13) { + //If user press enter key inside a form, submit it + //Unless the user is also holding down the 'shift' key + if (event.keyCode === 13 && !event.shiftKey) { event.preventDefault(); const $form = $(event.currentTarget).closest('form'); $form.find('button[type=submit]').click(); diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 6fd83386..3e582b6f 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -6,7 +6,9 @@ template(name="minicard") .minicard-labels each labels .minicard-label(class="card-label-{{color}}" title="{{name}}") - .minicard-title= title + .minicard-title + +viewer + = title .dates if startAt .date |