Changeset 782656

Timestamp:

10/04/2013 05:29:12 PM (12 years ago)

Author:

dmikam

Message:

FIX: added support for url(data:...) in css

File:

• async-js-and-css/trunk/functions.php (modified) (7 diffs)

async-js-and-css/trunk/functions.php

@@ -34 +34 @@
             }
 
-            var element = document.createElement("script");
-            element.setAttribute('type','text/javascript');
-            element.src = decodeURIComponent(script.src.replace(/\+/g, ' '));
-
-            onload(element,function(){
+
+            if (script.src!=''){
+                var element = document.createElement("script");
+                element.setAttribute('type','text/javascript');
+                element.src = decodeURIComponent(script.src.replace(/\+/g, ' '));
+
+                onload(element,function(){
+                    console.log('Script loaded: '+script.name);
+                    scriptsToLoad--;
+                    loadedScripts.push(script.name);
+                });
+
+                document.body.appendChild(element);
+            }else{
+                console.log('dependency wrapper loaded: '+script.name);
                 scriptsToLoad--;
                 loadedScripts.push(script.name);
-            });
-
-            document.body.appendChild(element);
+            }
         }
 
@@ -96 +104 @@
             $name = $wp_scripts->queue[$i];
             $script = $wp_scripts->registered[$name];
-            if (strpos($script->src,'http')!==0){
+            //~ var_dump($script);
+            if ($script->src!='' && strpos($script->src,'http')!==0 && strpos($script->src,'//')!==0){
                 $script->src = rtrim(get_bloginfo('wpurl'),'/').'/'.ltrim($script->src,'/');
             }
@@ -123 +132 @@
                     $list[] = array(
                         'name'  => $name,
-                        'src'   => $script->src.((!empty($script->ver) && !$remove_GET_part) ? '?ver='.$script->ver : ''),
+                        'src'   => $script->src=='' ? '' : $script->src.((!empty($script->ver) && !$remove_GET_part) ? '?ver='.$script->ver : ''),
                         'deps'  => $script->deps,
                         'extra' => get_script_extra($script)
@@ -132 +141 @@
                 $list[] = array(
                     'name'  => $name,
-                    'src'   => $script->src.((!empty($script->ver) && !$remove_GET_part) ? '?ver='.$script->ver : ''),
+                    'src'   => $script->src=='' ? '' : $script->src.((!empty($script->ver) && !$remove_GET_part) ? '?ver='.$script->ver : ''),
                     'extra' => get_script_extra($script)
                 );
@@ -249 +258 @@
 
     //~ $css = preg_replace("/url\(['\"]?([^\/][^'\"\)]*)['\"]?\)/i","url('{$css_dir}/$1')",$css);
-    $css = preg_replace("/url\(['\"]?([^\/][^'\"\)]*)['\"]?\)/i","url({$css_dir}/$1)",$css);
+    //~ $css = preg_replace("/url\(['\"]?([^\/][^'\"\)]*)['\"]?\)/i","url({$css_dir}/$1)",$css);
+    $css = preg_replace("/url\(['\"]?[^(data:)]([^\/][^'\"\)]*)['\"]?\)/i","url({$css_dir}/$1)",$css);
 
     return $css;
@@ -308 +318 @@
     if (is_string($file) && isset($wp_scripts->registered[$file])){
         $file = $wp_scripts->registered[$file];
+        unset($wp_scripts->registered[$file]->deps);
     }elseif(is_string($file) && isset($wp_styles->registered[$file])){
         $file = $wp_styles->registered[$file];
+        unset($wp_styles->registered[$file]->deps);
     }elseif(is_string($file)){
         foreach ($wp_scripts->queue as $q){
             if (strpos($wp_scripts->registered[$q]->src,$file)!==FALSE){
                 $file = $wp_scripts->registered[$q];
+                unset($wp_scripts->registered[$q]->deps);
                 break;
             }
@@ -320 +333 @@
             if (strpos($wp_styles->registered[$q]->src,$file)!==FALSE){
                 $file = $wp_styles->registered[$q];
+                unset($wp_styles->registered[$q]->deps);
                 break;
             }