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

FIX: Some odd jumping behavior for the timeline

This commit is contained in:
Robin Ward 2016-05-19 13:32:17 -04:00
parent cf25f634e7
commit 2bd59d7ca1
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -413,11 +413,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
}, },
jumpTop() { jumpTop() {
DiscourseURL.routeTo(this.get('model.firstPostUrl')); DiscourseURL.routeTo(this.get('model.firstPostUrl'), { skipIfOnScreen: false });
}, },
jumpBottom() { jumpBottom() {
DiscourseURL.routeTo(this.get('model.lastPostUrl')); DiscourseURL.routeTo(this.get('model.lastPostUrl'), { skipIfOnScreen: false });
}, },
selectAll() { selectAll() {

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

@ -100,6 +100,8 @@ const DiscourseURL = Ember.Object.extend({
keep the history intact. keep the history intact.
**/ **/
routeTo(path, opts) { routeTo(path, opts) {
opts = opts || {};
if (Em.isEmpty(path)) { return; } if (Em.isEmpty(path)) { return; }
if (Discourse.get('requiresRefresh')) { if (Discourse.get('requiresRefresh')) {
@ -143,12 +145,12 @@ const DiscourseURL = Ember.Object.extend({
rewrites.forEach(rw => path = path.replace(rw.regexp, rw.replacement)); rewrites.forEach(rw => path = path.replace(rw.regexp, rw.replacement));
if (this.navigatedToPost(oldPath, path)) { return; } if (this.navigatedToPost(oldPath, path, opts)) { return; }
// Schedule a DOM cleanup event // Schedule a DOM cleanup event
Em.run.scheduleOnce('afterRender', Discourse.Route, 'cleanDOM'); Em.run.scheduleOnce('afterRender', Discourse.Route, 'cleanDOM');
// TODO: Extract into rules we can inject into the URL handler // TODO: Extract into rules we can inject into the URL handler
if (this.navigatedToHome(oldPath, path)) { return; } if (this.navigatedToHome(oldPath, path, opts)) { return; }
if (oldPath === path) { if (oldPath === path) {
// If navigating to the same path send an app event. Views can watch it // If navigating to the same path send an app event. Views can watch it
@ -186,17 +188,11 @@ const DiscourseURL = Ember.Object.extend({
}, },
/** /**
@private
If the URL is in the topic form, /t/something/:topic_id/:post_number If the URL is in the topic form, /t/something/:topic_id/:post_number
then we want to apply some special logic. If the post_number changes within the then we want to apply some special logic. If the post_number changes within the
same topic, use replaceState and instruct our controller to load more posts. same topic, use replaceState and instruct our controller to load more posts.
@method navigatedToPost
@param {String} oldPath the previous path we were on
@param {String} path the path we're navigating to
**/ **/
navigatedToPost(oldPath, path) { navigatedToPost(oldPath, path, routeOpts) {
const newMatches = this.TOPIC_REGEXP.exec(path); const newMatches = this.TOPIC_REGEXP.exec(path);
const newTopicId = newMatches ? newMatches[2] : null; const newTopicId = newMatches ? newMatches[2] : null;
@ -227,7 +223,7 @@ const DiscourseURL = Ember.Object.extend({
this.appEvents.trigger('post:highlight', closest); this.appEvents.trigger('post:highlight', closest);
}).then(() => { }).then(() => {
DiscourseURL.jumpToPost(closest, {skipIfOnScreen: true}); DiscourseURL.jumpToPost(closest, {skipIfOnScreen: routeOpts.skipIfOnScreen});
}); });
// Abort routing, we have replaced our state. // Abort routing, we have replaced our state.