var $groups = array();
var $group = 0;
- function WP_Dependencies() {
- $args = func_get_args();
- call_user_func_array( array(&$this, '__construct'), $args );
- }
-
- function __construct() {}
-
/**
* Do the dependencies
*
- * Process the items passed to it or the queue. Processes all dependencies.
+ * Process the items passed to it or the queue. Processes all dependencies.
*
- * @param mixed handles (optional) items to be processed. (void) processes queue, (string) process that item, (array of strings) process those items
+ * @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, $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.
+ // 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 $key => $handle ) {
- if ( !in_array($handle, $this->done) && isset($this->registered[$handle]) ) {
+ if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
if ( ! $this->registered[$handle]->src ) { // Defines a group.
$this->done[] = $handle;
/**
* Determines dependencies
*
- * Recursively builds array of items to process taking dependencies into account. Does NOT catch infinite loops.
+ * Recursively builds array of items to process taking dependencies into account. Does NOT catch infinite loops.
*
-
- * @param mixed handles Accepts (string) dep name or (array of strings) dep names
- * @param bool recursion Used internally when function calls itself
+ *
+ * @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, $group = false ) {
if ( !$handles = (array) $handles )
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?)
+ $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, $group ) )
$keep_going = false; // Script requires deps which don't exist
if ( $recursion )
return false; // Abort this branch.
else
- continue; // We're at the top level. Move on to the next one.
+ continue; // We're at the top level. Move on to the next one.
}
if ( $queued ) // Already grobbed it and its deps
*
* Adds the item only if no item of that name already exists
*
- * @param string handle Script name
- * @param string src Script url
- * @param array deps (optional) Array of script names on which this script depends
- * @param string ver (optional) Script version (used for cache busting)
+ * @param string $handle Script name
+ * @param string $src Script url
+ * @param array $deps (optional) Array of script names on which this script depends
+ * @param string $ver (optional) Script version (used for cache busting)
* @return array Hierarchical array of dependencies
*/
function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
/**
* Adds extra data
*
- * Adds data only if script has already been added
+ * Adds data only if script has already been added.
*
- * @param string handle Script name
- * @param string data_name Name of object in which to store extra data
- * @param array data Array of extra data
+ * @param string $handle Script name
+ * @param string $key
+ * @param mixed $value
* @return bool success
*/
- function add_data( $handle, $data_name, $data ) {
- if ( !isset($this->registered[$handle]) )
+ function add_data( $handle, $key, $value ) {
+ if ( !isset( $this->registered[$handle] ) )
return false;
- return $this->registered[$handle]->add_data( $data_name, $data );
+
+ return $this->registered[$handle]->add_data( $key, $value );
+ }
+
+ /**
+ * Get extra data
+ *
+ * Gets data associated with a certain handle.
+ *
+ * @since WP 3.3
+ *
+ * @param string $handle Script name
+ * @param string $key
+ * @return mixed
+ */
+ function get_data( $handle, $key ) {
+ if ( !isset( $this->registered[$handle] ) )
+ return false;
+
+ if ( !isset( $this->registered[$handle]->extra[$key] ) )
+ return false;
+
+ return $this->registered[$handle]->extra[$key];
}
function remove( $handles ) {
var $extra = array();
- function _WP_Dependency() {
+ function __construct() {
@list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args();
if ( !is_array($this->deps) )
$this->deps = array();
- if ( !$this->ver )
- $this->ver = false;
}
function add_data( $name, $data ) {