sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve admin bar internal representation. Simpler signatures, with backwards compatibility. Add items without requiring parents to be added first. see #18197. 

git-svn-id: https://develop.svn.wordpress.org/trunk@19120 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Daryl Koopersmith 2011-11-02 20:34:54 +00:00
parent 33ee9a7d04
commit e2a62a3134
1 changed files with 97 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
wp-includes/class-wp-admin-bar.php
View File

@ -1,8 +1,10 @@
<?php <?php
class WP_Admin_Bar { class WP_Admin_Bar {
var $menu; private $nodes = array();
var $proto = 'http://'; private $root = array();
var $user;
public $proto = 'http://';
public $user;
function initialize() { function initialize() {
/* Set the protocol used throughout this code */ /* Set the protocol used throughout this code */
@ -10,7 +12,6 @@ class WP_Admin_Bar {
$this->proto = 'https://'; $this->proto = 'https://';
$this->user = new stdClass; $this->user = new stdClass;
$this->menu = new stdClass;
if ( is_user_logged_in() ) { if ( is_user_logged_in() ) {
/* Populate settings we need for the menu based on the current user. */ /* Populate settings we need for the menu based on the current user. */
@ -46,83 +47,109 @@ class WP_Admin_Bar {
do_action( 'admin_bar_init' ); do_action( 'admin_bar_init' );
} }
function add_menu( $args = array() ) { public function add_menu( $node ) {
$defaults = array( $this->add_node( $node );
'title' => false, }
'href' => false,
'parent' => false, // false for a root menu, pass the ID value for a submenu of that menu.
'id' => false, // defaults to a sanitized title value.
'meta' => false // array of any of the following options: array( 'html' => '', 'class' => '', 'onclick' => '', target => '', title => '' );
);
$r = wp_parse_args( $args, $defaults ); public function remove_menu( $id ) {
extract( $r, EXTR_SKIP ); $this->remove_node( $id );
}
if ( empty( $title ) ) /**
* Add a node to the menu.
*
* @param array $args - The arguments for each node.
* - id - string - The ID of the item.
* - title - string - The title of the node.
* - parent - string - The ID of the parent node. Optional.
* - href - string - The link for the item. Optional.
* - meta - array - Meta data including the following keys: html, class, onclick, target, title.
*/
public function add_node( $args ) {
// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
// Ensure we have a valid ID and title.
if ( empty( $args['title'] ) || empty( $args['id'] ) )
return false; return false;
/* Make sure we have a valid ID */ $defaults = array(
if ( empty( $id ) ) 'id' => false,
$id = esc_attr( sanitize_title( trim( $title ) ) ); 'title' => false,
'parent' => false,
'href' => false,
'meta' => array(),
);
if ( ! empty( $parent ) ) { // If the node already exists, keep any data that isn't provided.
/* Add the menu to the parent item */ if ( isset( $this->nodes[ $args['id'] ] ) )
$child = array( 'id' => $id, 'title' => $title, 'href' => $href ); $defaults = (array) $this->nodes[ $args['id'] ];
if ( ! empty( $meta ) ) $args = wp_parse_args( $args, $defaults );
$child['meta'] = $meta;
$this->add_node( $parent, $this->menu, $child ); $this->nodes[ $args['id'] ] = (object) $args;
} else { }
/* Add the menu item */
$this->menu->{$id} = array( 'title' => $title, 'href' => $href );
if ( ! empty( $meta ) ) public function remove_node( $id ) {
$this->menu->{$id}['meta'] = $meta; unset( $this->nodes[ $id ] );
}
public function render() {
// Link nodes to parents.
foreach ( $this->nodes as $node ) {
// Handle root menu items
if ( empty( $node->parent ) ) {
$this->root[] = $node;
continue;
}
// If the parent node isn't registered, ignore the node.
if ( ! isset( $this->nodes[ $node->parent ] ) )
continue;
$parent = $this->nodes[ $node->parent ];
if ( ! isset( $parent->children ) )
$parent->children = array();
$parent->children[] = $node;
} }
}
function remove_menu( $id ) {
return $this->remove_node( $id, $this->menu );
}
function render() {
?> ?>
<div id="wpadminbar" class="nojq nojs"> <div id="wpadminbar" class="nojq nojs">
<div class="quicklinks"> <div class="quicklinks">
<ul class="ab-top-menu"> <ul class="ab-top-menu"><?php
<?php foreach ( (array) $this->menu as $id => $menu_item ) : ?>
<?php $this->recursive_render( $id, $menu_item ) ?> foreach ( $this->root as $node ) {
<?php endforeach; ?> $this->recursive_render( $node );
</ul> }
?></ul>
</div> </div>
</div> </div>
<?php <?php
/* Wipe the menu, might reduce memory usage, but probably not. */
$this->menu = null;
} }
/* Helpers */ function recursive_render( $node ) {
function recursive_render( $id, &$menu_item ) { ?> $is_parent = ! empty( $node->children );
<?php
$is_parent = ! empty( $menu_item['children'] );
$menuclass = $is_parent ? 'menupop' : ''; $menuclass = $is_parent ? 'menupop' : '';
if ( ! empty( $menu_item['meta']['class'] ) ) if ( ! empty( $node->meta['class'] ) )
$menuclass .= ' ' . $menu_item['meta']['class']; $menuclass .= ' ' . $node->meta['class'];
?> ?>
<li id="<?php echo esc_attr( "wp-admin-bar-$id" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>"> <li id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>">
<a href="<?php echo esc_url( $menu_item['href'] ) ?>"<?php <a href="<?php echo esc_url( $node->href ) ?>"<?php
if ( ! empty( $menu_item['meta']['onclick'] ) ) : if ( ! empty( $node->meta['onclick'] ) ) :
?> onclick="<?php echo esc_js( $menu_item['meta']['onclick'] ); ?>"<?php ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
endif; endif;
if ( ! empty( $menu_item['meta']['target'] ) ) : if ( ! empty( $node->meta['target'] ) ) :
?> target="<?php echo esc_attr( $menu_item['meta']['target'] ); ?>"<?php ?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
endif; endif;
if ( ! empty( $menu_item['meta']['title'] ) ) : if ( ! empty( $node->meta['title'] ) ) :
?> title="<?php echo esc_attr( $menu_item['meta']['title'] ); ?>"<?php ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
endif; endif;
?>><?php ?>><?php
@ -131,7 +158,7 @@ class WP_Admin_Bar {
?><span><?php ?><span><?php
endif; endif;
echo $menu_item['title']; echo $node->title;
if ( $is_parent ) : if ( $is_parent ) :
?></span><?php ?></span><?php
@ -140,36 +167,22 @@ class WP_Admin_Bar {
?></a> ?></a>
<?php if ( $is_parent ) : ?> <?php if ( $is_parent ) : ?>
<ul> <ul><?php
<?php foreach ( $menu_item['children'] as $child_id => $child_menu_item ) : ?>
<?php $this->recursive_render( $child_id, $child_menu_item ); ?>
<?php endforeach; ?>
</ul>
<?php endif; ?>
<?php if ( ! empty( $menu_item['meta']['html'] ) ) : ?> // Render children.
<?php echo $menu_item['meta']['html']; ?> foreach ( $node->children as $child_node ) {
<?php endif; ?> $this->recursive_render( $child_node );
}
?></ul>
<?php endif;
if ( ! empty( $node->meta['html'] ) )
echo $node->meta['html'];
?>
</li><?php </li><?php
}
function add_node( $parent_id, &$menu, $child ) {
foreach( $menu as $id => $menu_item ) {
if ( $parent_id == $id ) {
if ( ! isset( $menu->{$parent_id}['children'] ) )
$menu->{$parent_id}['children'] = new stdClass;
$menu->{$parent_id}['children']->{$child['id']} = $child;
$child = null;
return true;
}
if ( ! empty( $menu->{$id}['children'] ) )
$this->add_node( $parent_id, $menu->{$id}['children'], $child );
}
$child = null;
return false;
} }
function add_menus() { function add_menus() {
@ -196,19 +209,5 @@ class WP_Admin_Bar {
do_action( 'add_admin_bar_menus' ); do_action( 'add_admin_bar_menus' );
} }
function remove_node( $id, &$menu ) {
if ( isset( $menu->$id ) ) {
unset( $menu->$id );
return true;
}
foreach( $menu as $menu_item_id => $menu_item ) {
if ( ! empty( $menu->{$menu_item_id}['children'] ) )
$this->remove_node( $id, $menu->{$menu_item_id}['children'] );
}
return false;
}
} }
?> ?>