From f7bf4b2dc36882ffd56fc164ad4e82cf55c25970 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 3 Feb 2014 14:50:51 +1100 Subject: [PATCH] BUGFIX: notifying on new topics when topic list is not visible --- .../discourse/controllers/discovery_topics_controller.js | 4 +++- .../javascripts/discourse/views/discovery_topics_view.js | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/discovery_topics_controller.js b/app/assets/javascripts/discourse/controllers/discovery_topics_controller.js index ace88ad3c6..0711941b9a 100644 --- a/app/assets/javascripts/discourse/controllers/discovery_topics_controller.js +++ b/app/assets/javascripts/discourse/controllers/discovery_topics_controller.js @@ -54,7 +54,9 @@ Discourse.DiscoveryTopicsController = Discourse.DiscoveryController.extend({ daily: Em.computed.equal('period', 'daily'), updateTitle: function(){ - Discourse.notifyTitle(this.get('topicTrackingState.incomingCount')); + if(this.get('enableTitleUpdate')) { + Discourse.notifyTitle(this.get('topicTrackingState.incomingCount')); + } }.observes('topicTrackingState.incomingCount'), footerMessage: function() { diff --git a/app/assets/javascripts/discourse/views/discovery_topics_view.js b/app/assets/javascripts/discourse/views/discovery_topics_view.js index 9a1cd64138..fe8700fd81 100644 --- a/app/assets/javascripts/discourse/views/discovery_topics_view.js +++ b/app/assets/javascripts/discourse/views/discovery_topics_view.js @@ -31,6 +31,14 @@ Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.LoadMore, { } }, + didInsertElement: function() { + this.set('controller.enableTitleUpdate', true); + }, + + willDestroyElement: function() { + this.set('controller.enableTitleUpdate', false); + }, + // Remember where we were scrolled to saveScrollPosition: function() { Discourse.Session.current().set('topicListScrollPosition', $(window).scrollTop());