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

FIX: Use observer to rerender widget instead.

This commit is contained in:
Guo Xiang Tan 2017-05-17 10:29:18 +08:00
parent 0984763013
commit 92118dd1d1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/components/topic-notifications-button.js.es6
View File

@ -9,14 +9,11 @@ export default MountWidget.extend({
}, },
@observes('topic.details.notification_level') @observes('topic.details.notification_level')
_triggerEvent() { _queueRerender() {
this.appEvents.trigger('topic-notifications-button:changed', { this.queueRerender();
type: 'notification', id: this.get('topic.details.notification_level')
});
}, },
didInsertElement() { didInsertElement() {
this._super(); this._super();
this.dispatch('topic-notifications-button:changed', 'topic-notifications-button');
} }
}); });

5
app/assets/javascripts/discourse/components/topic-timeline.js.es6
View File

@ -38,6 +38,11 @@ export default MountWidget.extend(Docking, {
this.queueRerender(() => this.queueDockCheck()); this.queueRerender(() => this.queueDockCheck());
}, },
@observes('topic.details.notification_level')
_queueRerender() {
this.queueRerender();
},
dockCheck(info) { dockCheck(info) {
const mainOffset = $('#main').offset(); const mainOffset = $('#main').offset();
const offsetTop = mainOffset ? mainOffset.top : 0; const offsetTop = mainOffset ? mainOffset.top : 0;

4
app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6
View File

@ -91,9 +91,7 @@ export default createWidget('topic-notifications-button', {
topicNotificationsButtonChanged(msg) { topicNotificationsButtonChanged(msg) {
switch(msg.type) { switch(msg.type) {
case 'notification': case 'notification':
if (this.attrs.topic.get('details.notification_level') !== msg.id) { this.notificationLevelChanged(msg.id);
this.notificationLevelChanged(msg.id);
}
break; break;
} }
} }