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

git-svn-id: https://develop.svn.wordpress.org/trunk@10357 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2009-01-14 14:18:51 +00:00
parent 1677a33778
commit 22eddf34d2
10 changed files with 726 additions and 58 deletions

View File

@@ -22,6 +22,8 @@ class WP_Dependencies {
var $to_do = array();
var $done = array();
var $args = array();
var $groups = array();
var $group = 0;
function WP_Dependencies() {
$args = func_get_args();
@@ -38,21 +40,26 @@ class WP_Dependencies {
* @param mixed handles (optional) items to be processed. (void) processes queue, (string) process that item, (array of strings) process those items
* @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;
}
@@ -69,25 +76,31 @@ class WP_Dependencies {
* @param mixed handles Accepts (string) dep name or (array of strings) dep names
* @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];
$handle_parts = explode('?', $handle);
$handle = $handle_parts[0];
if ( isset($this->to_do[$handle]) ) // Already grobbed it and its deps
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;
if ( !isset($this->registered[$handle]) )
$keep_going = false; // Script doesn't exist
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
if ( !$keep_going ) { // Either script or its deps don't exist.
@@ -97,11 +110,9 @@ class WP_Dependencies {
continue; // We're at the top level. Move on to the next one.
}
$this->to_do[$handle] = true;
$this->to_do[] = $handle;
}
if ( !$recursion ) // at the end
$this->to_do = array_keys( $this->to_do );
return true;
}
@@ -181,6 +192,21 @@ class WP_Dependencies {
return false;
}
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;
}
}
class _WP_Dependency {