Changeset 10357 for trunk/wp-includes/class.wp-dependencies.php

Timestamp:

01/14/2009 02:18:51 PM (16 years ago)

Author:

azaozz

Message:

Split the script queue in head and footer part, concatenate and compress the default js and css, first run, see #8628

File:

• trunk/wp-includes/class.wp-dependencies.php (modified) (6 diffs)

trunk/wp-includes/class.wp-dependencies.php

@@ -23 +23 @@
     var $done = array();
     var $args = array();
+    var $groups = array();
+    var $group = 0;
 
     function WP_Dependencies() {
@@ -39 +41 @@
      * @return array Items that have been processed
      */
-    function do_items( $handles = false ) {
+    function do_items( $handles = false, $group = false ) {
         // Print the queue if nothing is passed.  If a string is passed, print that script.  If an array is passed, print those scripts.
         $handles = false === $handles ? $this->queue : (array) $handles;
         $this->all_deps( $handles );
 
-        foreach( $this->to_do as $handle ) {
+        foreach( $this->to_do as $key => $handle ) {
             if ( !in_array($handle, $this->done) && isset($this->registered[$handle]) ) {
-                if ( $this->registered[$handle]->src ) { // Else it defines a group.
-                    $this->do_item( $handle );
+
+                if ( ! $this->registered[$handle]->src ) { // Defines a group.
+                    $this->done[] = $handle;
+                    continue;
                 }
-                $this->done[] = $handle;
+
+                if ( $this->do_item( $handle, $group ) )
+                    $this->done[] = $handle;
+
+                unset( $this->to_do[$key] );
             }
         }
 
-        $this->to_do = array();
         return $this->done;
     }
@@ -70 +77 @@
      * @param bool recursion Used internally when function calls itself
      */
-    function all_deps( $handles, $recursion = false ) {
+    function all_deps( $handles, $recursion = false, $group = false ) {
         if ( !$handles = (array) $handles )
             return false;
 
         foreach ( $handles as $handle ) {
-            $handle = explode('?', $handle);
-            if ( isset($handle[1]) )
-                $this->args[$handle[0]] = $handle[1];
-            $handle = $handle[0];
-
-            if ( isset($this->to_do[$handle]) ) // Already grobbed it and its deps
+            $handle_parts = explode('?', $handle);
+            $handle = $handle_parts[0];
+
+            if ( in_array($handle, $this->done, true) ) // Already done
                 continue;
+
+            $this->set_group( $handle, $recursion, $group );
+
+            if ( in_array($handle, $this->to_do, true) ) // Already grobbed it and its deps
+                continue;
+
+            if ( isset($handle_parts[1]) )
+                $this->args[$handle] = $handle_parts[1];
 
             $keep_going = true;
@@ -88 +101 @@
             elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
                 $keep_going = false; // Script requires deps which don't exist (not a necessary check.  efficiency?)
-            elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true ) )
+            elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) )
                 $keep_going = false; // Script requires deps which don't exist
 
@@ -98 +111 @@
             }
 
-            $this->to_do[$handle] = true;
+            $this->to_do[] = $handle;
         }
 
-        if ( !$recursion ) // at the end
-            $this->to_do = array_keys( $this->to_do );
         return true;
     }
@@ -182 +193 @@
     }
 
+    function set_group( $handle, $recursion, $group ) {
+        $group = (int) $group;
+
+        if ( $recursion )
+            $group = min($this->group, $group);
+        else
+            $this->group = $group;
+
+        if ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group )
+            return false;
+
+        $this->groups[$handle] = $group;
+        return true;
+    }
+
 }