From a09d4715142a1a818a2fbec71803387e7f722c46 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 13 Mar 2015 19:31:33 +1100
Subject: [PATCH] Correct CDN url creation for "//" rooted CDNs

---
 app/assets/javascripts/discourse/lib/load-script.js.es6 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index 34b723e53bf..6fe83424594 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -35,7 +35,14 @@ export default function loadScript(url, opts) {
 
     if (Discourse.CDN && url[0] === "/") {
       // 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)