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

remove hacky protocol code, not needed

Browse Source
This commit is contained in:
Sam
2015-03-13 20:50:38 +11:00
parent 4301ce6613
commit f359cdeddc
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,16 +33,9 @@ export default function loadScript(url, opts) {
var cdnUrl = url; var cdnUrl = url;
// Scripts should always load from CDN
if (Discourse.CDN && url[0] === "/" && url[1] !== "/") { if (Discourse.CDN && url[0] === "/" && url[1] !== "/") {
// 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)