From cae7af4b070762936197c026b9d151a129d74a6f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 26 Feb 2014 12:04:55 -0500
Subject: [PATCH] BUGFIX: Do not scroll to top / show spinner when leaving a
topic.
---
.../discourse/controllers/poster_expansion_controller.js | 4 +++-
app/assets/javascripts/discourse/models/post_stream.js | 3 +--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/discourse/controllers/poster_expansion_controller.js b/app/assets/javascripts/discourse/controllers/poster_expansion_controller.js
index 7b845be4a..ae3959f77 100644
--- a/app/assets/javascripts/discourse/controllers/poster_expansion_controller.js
+++ b/app/assets/javascripts/discourse/controllers/poster_expansion_controller.js
@@ -66,7 +66,9 @@ Discourse.PosterExpansionController = Discourse.ObjectController.extend({
},
cancelFilter: function() {
- this.get('postStream').cancelFilter();
+ var postStream = this.get('postStream');
+ postStream.cancelFilter();
+ postStream.refresh();
this.close();
}
}
diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js
index cb13182a6..d2182a371 100644
--- a/app/assets/javascripts/discourse/models/post_stream.js
+++ b/app/assets/javascripts/discourse/models/post_stream.js
@@ -176,7 +176,7 @@ Discourse.PostStream = Em.Object.extend({
/**
- Cancel any active filters on the stream and refresh it.
+ Cancel any active filters on the stream.
@method cancelFilter
@returns {Ember.Deferred} a promise that resolves when the filter has been cancelled.
@@ -184,7 +184,6 @@ Discourse.PostStream = Em.Object.extend({
cancelFilter: function() {
this.set('summary', false);
this.get('userFilters').clear();
- return this.refresh();
},
/**