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

Correct CDN url creation for "//" rooted CDNs

Browse Source
This commit is contained in:
Sam
2015-03-13 19:31:33 +11:00
parent 08abb85682
commit a09d471514
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/lib/load-script.js.es6
View File

@ -35,7 +35,14 @@ export default function loadScript(url, opts) {
if (Discourse.CDN && url[0] === "/") { if (Discourse.CDN && url[0] === "/") {
// ensure stuff is rooted correctly // ensure stuff is rooted correctly
cdnUrl = Discourse.CDN.replace(/\/$/,"") + url; cdnUrl = Discourse.CDN.replace(/\/$/,"");
// protocol agnostic so append protocol
if ( cdnUrl[0] === "/" && cdnUrl[1] === "/") {
cdnUrl = window.location.protocol + cdnUrl;
}
cdnUrl += url;
} }
// Some javascript depends on the path of where it is loaded (ace editor) // Some javascript depends on the path of where it is loaded (ace editor)