github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 10:43:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3735 from riking/patch-4

Browse Source 
FIX: Discourse.BaseUri should not default to /
This commit is contained in:
Robin Ward
2015-11-06 14:52:19 -05:00
parent b699d43b1b aca70805f1
commit 8ba7c06b7d
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse.js
View File

@ -16,13 +16,10 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
// if it's a non relative URL, return it.
if (url !== '/' && !/^\/[^\/]/.test(url)) return url;
var u = Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri;
if (url.indexOf(Discourse.BaseUri) !== -1) return url;
if (url[0] !== "/") url = "/" + url;
if (u[u.length-1] === '/') u = u.substring(0, u.length-1);
if (url.indexOf(u) !== -1) return url;
if (u.length > 0 && url[0] !== "/") url = "/" + url;
return u + url;
return Discourse.BaseUri + url;
},
getURLWithCDN: function(url) {