summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
Diffstat (limited to 'client/components')
-rw-r--r--client/components/activities/activities.jade2
-rw-r--r--client/components/cards/cardDetails.jade2
-rw-r--r--client/components/cards/cardDetails.js2
-rw-r--r--client/components/lists/listBody.js2
4 files changed, 3 insertions, 5 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index deaee25e..4d5410d4 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -90,7 +90,7 @@ template(name="boardActivities")
template(name="cardActivities")
each currentCard.activities
- .activity.js-card-activity
+ .activity
+userAvatar(userId=user._id)
p.activity-desc
+memberName(user=user)
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 26a5adb9..836a2353 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -104,7 +104,7 @@ BlazeComponent.extendComponent({
this.parentComponent().mouseHasEnterCardDetails = true;
},
'click #toggleButton'() {
- $('div.activity.js-card-activity:not(:has(.activity-comment))').toggle();
+ Meteor.call('toggleSystemMessages');
},
}];
},
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index b9365448..724e805b 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -83,8 +83,6 @@ BlazeComponent.extendComponent({
evt.stopImmediatePropagation();
evt.preventDefault();
Utils.goBoardId(Session.get('currentBoard'));
- } else if (!Meteor.user().hasHiddenSystemMessages()) {
- $('.toggle-switch').prop('checked', false);
}
},