diff --git a/app/assets/javascripts/discourse/components/home-logo.js.es6 b/app/assets/javascripts/discourse/components/home-logo.js.es6 index 97fc2cb2e..db7747622 100644 --- a/app/assets/javascripts/discourse/components/home-logo.js.es6 +++ b/app/assets/javascripts/discourse/components/home-logo.js.es6 @@ -1,10 +1,6 @@ export default Ember.Component.extend({ classNames: ["title"], - linkUrl: function() { - return Discourse.getURL("/"); - }.property(), - showSmallLogo: function() { return !Discourse.Mobile.mobileView && this.get("minimized"); }.property("minimized"), @@ -12,4 +8,15 @@ export default Ember.Component.extend({ smallLogoUrl: Discourse.computed.setting('logo_small_url'), bigLogoUrl: Discourse.computed.setting('logo_url'), title: Discourse.computed.setting('title'), + + click: function(e) { + e.preventDefault(); + + // When you click the logo, never use a cached list + var session = Discourse.Session.current(); + session.setProperties({topicList: null, topicListScrollPos: null}); + + Discourse.URL.routeTo('/'); + return false; + } }); diff --git a/app/assets/javascripts/discourse/models/topic_list.js b/app/assets/javascripts/discourse/models/topic_list.js index 5b1647d92..afede7cbb 100644 --- a/app/assets/javascripts/discourse/models/topic_list.js +++ b/app/assets/javascripts/discourse/models/topic_list.js @@ -205,7 +205,7 @@ Discourse.TopicList.reopenClass({ var session = Discourse.Session.current(), list = session.get('topicList'); - if (list && (list.get('filter') === filter) && window.location.pathname.indexOf('more') > 0) { + if (list && (list.get('filter') === filter)) { list.set('loaded', true); return Ember.RSVP.resolve(list); } diff --git a/app/assets/javascripts/discourse/templates/components/home-logo.js.handlebars b/app/assets/javascripts/discourse/templates/components/home-logo.js.handlebars index d1690970e..03a2c8861 100644 --- a/app/assets/javascripts/discourse/templates/components/home-logo.js.handlebars +++ b/app/assets/javascripts/discourse/templates/components/home-logo.js.handlebars @@ -1,4 +1,4 @@ - + {{#if showSmallLogo}} {{#if smallLogoUrl}}