Browse Source

handle css urls better

Gregg Tavares 6 years ago
parent
commit
2a8973489f
1 changed files with 5 additions and 3 deletions
  1. 5 3
      threejs/resources/editor.js

+ 5 - 3
threejs/resources/editor.js

@@ -50,17 +50,19 @@ function getPrefix(url) {
 }
 
 function fixCSSLinks(url, source) {
-  const cssUrlRE = /(url\()(.*?)(\))/g;
+  const cssUrlRE1 = /(url\(')(.*?)('\))/g;
+  const cssUrlRE2 = /(url\()(.*?)(\))/g;
   const prefix = getPrefix(url);
 
   function addPrefix(url) {
-    return url.indexOf('://') < 0 ? (prefix + url) : url;
+    return url.indexOf('://') < 0 ? `${prefix}/${url}` : url;
   }
   function makeFQ(match, prefix, url, suffix) {
     return `${prefix}${addPrefix(url)}${suffix}`;
   }
 
-  source = source.replace(cssUrlRE, makeFQ);
+  source = source.replace(cssUrlRE1, makeFQ);
+  source = source.replace(cssUrlRE2, makeFQ);
   return source;
 }