github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 07:34:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: Do not scroll to top / show spinner when leaving a topic.

Browse Source
This commit is contained in:
Robin Ward 2014-02-26 12:04:55 -05:00
parent c668d49822
commit cae7af4b07
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/poster_expansion_controller.js
View File

@ -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();
}
}

3
app/assets/javascripts/discourse/models/post_stream.js
View File

@ -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();
},
/**