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

FIX: When viewing a summary, if a post jumps to the bottom cancel it.

This commit is contained in:
Robin Ward 2016-04-13 15:58:37 -04:00
parent 332bf311c7
commit 95854a94c9
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/lib/url.js.es6
View File

@ -217,6 +217,8 @@ const DiscourseURL = Ember.Object.createWithMixins({
if (path.match(/last$/)) { opts.nearPost = topicController.get('model.highest_post_number'); } if (path.match(/last$/)) { opts.nearPost = topicController.get('model.highest_post_number'); }
const closest = opts.nearPost || 1; const closest = opts.nearPost || 1;
opts.cancelSummary = true;
postStream.refresh(opts).then(() => { postStream.refresh(opts).then(() => {
topicController.setProperties({ topicController.setProperties({
'model.currentPost': closest, 'model.currentPost': closest,

5
app/assets/javascripts/discourse/models/post-stream.js.es6
View File

@ -194,6 +194,11 @@ export default RestModel.extend({
opts = opts || {}; opts = opts || {};
opts.nearPost = parseInt(opts.nearPost, 10); opts.nearPost = parseInt(opts.nearPost, 10);
if (opts.cancelSummary) {
this.set('summary', false);
delete opts.cancelSummary;
}
const topic = this.get('topic'); const topic = this.get('topic');
// Do we already have the post in our list of posts? Jump there. // Do we already have the post in our list of posts? Jump there.