Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: ensures shortcuts work correctly with topic-notifications-button (#8956)

This commit is contained in:
Joffrey JAFFEUX 2020-02-13 10:01:28 +01:00 committed by GitHub
parent 42bda52486
commit 3875785dcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
View File

@ -6,11 +6,35 @@ export default Component.extend({
appendReason: true,
showFullTitle: true,
didInsertElement() {
this._super(...arguments);
this.appEvents.on(
"topic-notifications-button:changed",
this,
"_changeTopicNotificationLevel"
);
},
willDestroyElement() {
this._super(...arguments);
this.appEvents.off(
"topic-notifications-button:changed",
this,
"_changeTopicNotificationLevel"
);
},
_changeTopicNotificationLevel(level) {
if (level.id !== this.notificationLevel) {
this.topic.details.updateNotifications(level.id);
}
},
actions: {
changeTopicNotificationLevel(newNotificationLevel) {
if (newNotificationLevel !== this.notificationLevel) {
this.topic.details.updateNotifications(newNotificationLevel);
}
changeTopicNotificationLevel(level, notification) {
this._changeTopicNotificationLevel(notification);
}
}
});

14
app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
View File

@ -16,17 +16,5 @@ export default NotificationsButtonComponent.extend({
i18nPostfix: computed("topic.archetype", function() {
return this.topic.archetype === "private_message" ? "_pm" : "";
}),
didInsertElement() {
this._super(...arguments);
this.appEvents.on("topic-notifications-button:changed", this, "onSelect");
},
willDestroyElement() {
this._super(...arguments);
this.appEvents.off("topic-notifications-button:changed", this, "onSelect");
}
})
});