BUGFIX: clicking on links to the same domain was broken
This commit is contained in:
@@ -54,9 +54,9 @@ Discourse.URL = Em.Object.createWithMixins({
|
||||
}
|
||||
|
||||
var oldPath = window.location.pathname;
|
||||
path = path.replace(/https?\:\/\/[^\/]+/, '');
|
||||
path = path.replace(/(https?\:)?\/\/[^\/]+/, '');
|
||||
|
||||
// If the URL is absolute, remove rootURL
|
||||
// handle prefixes
|
||||
if (path.match(/^\//)) {
|
||||
var rootURL = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri);
|
||||
rootURL = rootURL.replace(/\/$/, '');
|
||||
@@ -71,11 +71,8 @@ Discourse.URL = Em.Object.createWithMixins({
|
||||
if (path.match(/^\/?users\/[^\/]+$/)) {
|
||||
path += "/activity";
|
||||
}
|
||||
// Be wary of looking up the router. In this case, we have links in our
|
||||
// HTML, say form compiled markdown posts, that need to be routed.
|
||||
var router = this.get('router');
|
||||
router.router.updateURL(path);
|
||||
return router.handleURL(path);
|
||||
|
||||
return this.handleURL(path);
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -238,6 +235,21 @@ Discourse.URL = Em.Object.createWithMixins({
|
||||
**/
|
||||
controllerFor: function(name) {
|
||||
return Discourse.__container__.lookup('controller:' + name);
|
||||
},
|
||||
|
||||
/**
|
||||
@private
|
||||
|
||||
Be wary of looking up the router. In this case, we have links in our
|
||||
HTML, say form compiled markdown posts, that need to be routed.
|
||||
|
||||
@method handleURL
|
||||
@param {String} path the url to handle
|
||||
**/
|
||||
handleURL: function(path) {
|
||||
var router = this.get('router');
|
||||
router.router.updateURL(path);
|
||||
return router.handleURL(path);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user