IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 11:48:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: url was overriden when using the back button after visiting a topic

Browse Source
This commit is contained in:
Régis Hanol 2014-01-17 19:41:41 +01:00
parent e31789327e
commit 7f5ef60d5f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/routes/topic_route.js
View File

@ -63,13 +63,18 @@ Discourse.TopicRoute = Discourse.Route.extend({
// Use replaceState to update the URL once it changes // Use replaceState to update the URL once it changes
postChangedRoute: Discourse.debounce(function(currentPost) { postChangedRoute: Discourse.debounce(function(currentPost) {
// do nothing if we are transitioning to another route
if (this.get("isTransitioning")) { return; }
var topic = this.modelFor('topic'); var topic = this.modelFor('topic');
if (topic && currentPost) { if (topic && currentPost) {
var postUrl = topic.get('url'); var postUrl = topic.get('url');
if (currentPost > 1) { postUrl += "/" + currentPost; } if (currentPost > 1) { postUrl += "/" + currentPost; }
Discourse.URL.replaceState(postUrl); Discourse.URL.replaceState(postUrl);
} }
}, 1000) }, 150),
willTransition: function() { this.set("isTransitioning", true); }
}, },
@ -83,6 +88,7 @@ Discourse.TopicRoute = Discourse.Route.extend({
activate: function() { activate: function() {
this._super(); this._super();
this.set("isTransitioning", false);
var topic = this.modelFor('topic'); var topic = this.modelFor('topic');
Discourse.Session.currentProp('lastTopicIdViewed', parseInt(topic.get('id'), 10)); Discourse.Session.currentProp('lastTopicIdViewed', parseInt(topic.get('id'), 10));