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

Merge pull request #650 from wojciechka/double_prefix_fix 

Detect and remove prefix being added twice when going to pages already in history
This commit is contained in:
Robin Ward 2013-04-09 09:30:01 -07:00
parent c3a426930b 3cf240ada8
commit 5ba9e484f8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/routes/discourse_location.js
View File

@ -174,6 +174,13 @@ Ember.DiscourseLocation = Ember.Object.extend({
rootURL = rootURL.replace(/\/$/, ''); rootURL = rootURL.replace(/\/$/, '');
} }
// remove prefix from URL if it is already in url - i.e. /discourse/t/... -> /t/if rootURL is /discourse
// this sometimes happens when navigating to already visited location
if ((rootURL.length > 1) && (url.substring(0, rootURL.length + 1) === (rootURL + "/")))
{
url = url.substring(rootURL.length);
}
return rootURL + url; return rootURL + url;
}, },