diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-10-03 14:01:47 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-10-03 14:01:47 +0300 |
| commit | 1d3e2ffadd43c77281de2e325df50c1e3026a4c5 (patch) | |
| tree | 0208858cb2668c739470e8d327260e73c26477f1 /client/components/cards | |
| parent | 61dce8e65d1b6fe5cf785f93a3797c0783b1fb0f (diff) | |
| parent | 0074317bd3cb5e7cdc5c8dead8f6e7aa71584b7c (diff) | |
| download | wekan-1d3e2ffadd43c77281de2e325df50c1e3026a4c5.tar.gz wekan-1d3e2ffadd43c77281de2e325df50c1e3026a4c5.tar.bz2 wekan-1d3e2ffadd43c77281de2e325df50c1e3026a4c5.zip | |
Merge branch 'nztqa-improve-comment-only' into devel
Fix: Slider for Comments only does not work correctly with over 21 activities.
Thanks to nztqa ! Closes #1269
Diffstat (limited to 'client/components/cards')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 2 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.js | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 60b20a8a..caea222f 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -90,7 +90,7 @@ template(name="cardDetails") .material-toggle-switch span.toggle-switch-title {{_ 'hide-system-messages'}} if hiddenSystemMessages - input.toggle-switch(type="checkbox" id="toggleButton" checked="checked" disabled) + input.toggle-switch(type="checkbox" id="toggleButton" checked="checked") else input.toggle-switch(type="checkbox" id="toggleButton") label.toggle-label(for="toggleButton") diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index ecffe7aa..836a2353 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -29,7 +29,6 @@ BlazeComponent.extendComponent({ }, hiddenSystemMessages() { - console.log('doo:', Meteor.user().hasHiddenSystemMessages()); return Meteor.user().hasHiddenSystemMessages(); }, @@ -105,7 +104,7 @@ BlazeComponent.extendComponent({ this.parentComponent().mouseHasEnterCardDetails = true; }, 'click #toggleButton'() { - $('div.activity.js-card-activity:not(:has(.activity-comment))').toggle(); + Meteor.call('toggleSystemMessages'); }, }]; }, |