From 8628a57f4e185c06911b7c48d38c9d45a8c62ac3 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 20 Apr 2017 11:04:23 -0400
Subject: [PATCH] FIX: colors picker not working with CDN

---
 app/assets/javascripts/discourse/lib/load-script.js.es6 | 3 ++-
 1 file changed, 2 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 13dbbb6ecf4..8df26b8bb62 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -63,7 +63,8 @@ export default function loadScript(url, opts) {
     var cdnUrl = url;
 
     // Scripts should always load from CDN
-    if (Discourse.CDN && url[0] === "/" && url[1] !== "/") {
+    // CSS is type text, to accept it from a CDN we would need to handle CORS
+    if (!opts.css && Discourse.CDN && url[0] === "/" && url[1] !== "/") {
       cdnUrl = Discourse.CDN.replace(/\/$/,"") + url;
     }