From f359cdeddc4369e9fadace3cd1311b1e1d3bfdc8 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 13 Mar 2015 20:50:38 +1100 Subject: [PATCH] remove hacky protocol code, not needed --- .../javascripts/discourse/lib/load-script.js.es6 | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6 index 025b6f2d50b..1c56f9f0296 100644 --- a/app/assets/javascripts/discourse/lib/load-script.js.es6 +++ b/app/assets/javascripts/discourse/lib/load-script.js.es6 @@ -33,16 +33,9 @@ export default function loadScript(url, opts) { var cdnUrl = url; + // Scripts should always load from CDN if (Discourse.CDN && url[0] === "/" && url[1] !== "/") { - // ensure stuff is rooted correctly - cdnUrl = Discourse.CDN.replace(/\/$/,""); - - // protocol agnostic so append protocol - if ( cdnUrl[0] === "/" && cdnUrl[1] === "/") { - cdnUrl = window.location.protocol + cdnUrl; - } - - cdnUrl += url; + cdnUrl = Discourse.CDN.replace(/\/$/,"") + url; } // Some javascript depends on the path of where it is loaded (ace editor)