diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade index d01e465bd..e1e921e70 100644 --- a/client/components/lists/listBody.jade +++ b/client/components/lists/listBody.jade @@ -16,22 +16,13 @@ template(name="listBody") +viewer = formattedCurrencyCustomFieldValue(value) each (cardsWithLimit (idOrNull ../../_id)) - if isMiniScreen - a.minicard-wrapper.js-minicard.js-minicard-popup( - class="{{#if cardIsSelected}}is-selected{{/if}}" - class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}") - if MultiSelection.isActive - .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection( - class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}") - +minicard(this) - else - a.minicard-wrapper.js-minicard(href=originRelativeUrl - class="{{#if cardIsSelected}}is-selected{{/if}}" - class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}") - if MultiSelection.isActive - .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection( - class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}") - +minicard(this) + a.minicard-wrapper.js-minicard(href=originRelativeUrl + class="{{#if cardIsSelected}}is-selected{{/if}}" + class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}") + if MultiSelection.isActive + .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection( + class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}") + +minicard(this) if (showSpinner (idOrNull ../../_id)) +spinnerList diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 0de2fcc36..aa33e65c7 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -149,7 +149,9 @@ BlazeComponent.extendComponent({ // XXX We should probably modify the minicard href attribute instead of // overwriting the event in case the card is already selected. } else if (Utils.isMiniScreen()) { + evt.preventDefault(); Session.set('popupCard', this.currentData()._id); + this.cardDetailsPopup(evt); } else if (Session.equals('currentCard', this.currentData()._id)) { evt.stopImmediatePropagation(); evt.preventDefault(); @@ -228,7 +230,6 @@ BlazeComponent.extendComponent({ return [ { 'click .js-minicard': this.clickOnMiniCard, - 'click .js-minicard-popup': this.cardDetailsPopup, 'click .js-toggle-multi-selection': this.toggleMultiSelection, 'click .open-minicard-composer': this.scrollToBottom, submit: this.addCard,