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

FIX: Discourse.BaseUri should not default to /

Browse Source
This commit is contained in:
Kane York
2015-09-06 20:20:59 -07:00
parent f6380c66ef
commit aca70805f1
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 (!/^\/[^\/]/.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) {