Hide empty at walker level #5028

This commit is contained in:
Mike Jolley 2014-03-17 16:51:34 +00:00
parent 8d33594e6a
commit d9887bebbb
2 changed files with 43 additions and 53 deletions

View File

@ -25,7 +25,7 @@ class WC_Product_Cat_Dropdown_Walker extends Walker {
* @param int $depth Depth of category in reference to parents. * @param int $depth Depth of category in reference to parents.
* @param integer $current_object_id * @param integer $current_object_id
*/ */
function start_el( &$output, $cat, $depth = 0, $args = array(), $current_object_id = 0 ) { public function start_el( &$output, $cat, $depth = 0, $args = array(), $current_object_id = 0 ) {
if ( ! empty( $args['hierarchical'] ) ) if ( ! empty( $args['hierarchical'] ) )
$pad = str_repeat(' ', $depth * 3); $pad = str_repeat(' ', $depth * 3);
@ -50,4 +50,31 @@ class WC_Product_Cat_Dropdown_Walker extends Walker {
$output .= "</option>\n"; $output .= "</option>\n";
} }
/**
* Traverse elements to create list from elements.
*
* Display one element if the element doesn't have any children otherwise,
* display the element and its children. Will only traverse up to the max
* depth and no ignore elements under that depth. It is possible to set the
* max depth to include all depths, see walk() method.
*
* This method shouldn't be called directly, use the walk() method instead.
*
* @since 2.5.0
*
* @param object $element Data object
* @param array $children_elements List of elements to continue traversing.
* @param int $max_depth Max depth to traverse.
* @param int $depth Depth of current element.
* @param array $args
* @param string $output Passed by reference. Used to append additional content.
* @return null Null on failure with no changes to parameters.
*/
public function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) {
if ( ! $element || 0 === $element->count ) {
return;
}
parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
}
} }

View File

@ -24,7 +24,7 @@ class WC_Product_Cat_List_Walker extends Walker {
* @param int $depth Depth of category. Used for tab indentation. * @param int $depth Depth of category. Used for tab indentation.
* @param array $args Will only append content if style argument value is 'list'. * @param array $args Will only append content if style argument value is 'list'.
*/ */
function start_lvl( &$output, $depth = 0, $args = array() ) { public function start_lvl( &$output, $depth = 0, $args = array() ) {
if ( 'list' != $args['style'] ) if ( 'list' != $args['style'] )
return; return;
@ -40,7 +40,7 @@ class WC_Product_Cat_List_Walker extends Walker {
* @param int $depth Depth of category. Used for tab indentation. * @param int $depth Depth of category. Used for tab indentation.
* @param array $args Will only append content if style argument value is 'list'. * @param array $args Will only append content if style argument value is 'list'.
*/ */
function end_lvl( &$output, $depth = 0, $args = array() ) { public function end_lvl( &$output, $depth = 0, $args = array() ) {
if ( 'list' != $args['style'] ) if ( 'list' != $args['style'] )
return; return;
@ -57,24 +57,26 @@ class WC_Product_Cat_List_Walker extends Walker {
* @param int $depth Depth of category in reference to parents. * @param int $depth Depth of category in reference to parents.
* @param integer $current_object_id * @param integer $current_object_id
*/ */
function start_el( &$output, $cat, $depth = 0, $args = array(), $current_object_id = 0 ) { public function start_el( &$output, $cat, $depth = 0, $args = array(), $current_object_id = 0 ) {
$output .= '<li class="cat-item cat-item-' . $cat->term_id; $output .= '<li class="cat-item cat-item-' . $cat->term_id;
if ( $args['current_category'] == $cat->term_id ) if ( $args['current_category'] == $cat->term_id ) {
$output .= ' current-cat'; $output .= ' current-cat';
}
if ( $args['has_children'] && $args['hierarchical'] ) if ( $args['has_children'] && $args['hierarchical'] ) {
$output .= ' cat-parent'; $output .= ' cat-parent';
}
if ( $args['current_category_ancestors'] && $args['current_category'] && in_array( $cat->term_id, $args['current_category_ancestors'] ) ) if ( $args['current_category_ancestors'] && $args['current_category'] && in_array( $cat->term_id, $args['current_category_ancestors'] ) ) {
$output .= ' current-cat-parent'; $output .= ' current-cat-parent';
}
$output .= '"><a href="' . get_term_link( (int) $cat->term_id, 'product_cat' ) . '">' . __( $cat->name, 'woocommerce' ) . '</a>'; $output .= '"><a href="' . get_term_link( (int) $cat->term_id, 'product_cat' ) . '">' . __( $cat->name, 'woocommerce' ) . '</a>';
if ( $args['show_count'] ) if ( $args['show_count'] ) {
$output .= ' <span class="count">(' . $cat->count . ')</span>'; $output .= ' <span class="count">(' . $cat->count . ')</span>';
}
} }
/** /**
@ -86,10 +88,8 @@ class WC_Product_Cat_List_Walker extends Walker {
* @param int $depth Depth of category. Not used. * @param int $depth Depth of category. Not used.
* @param array $args Only uses 'list' for whether should append to output. * @param array $args Only uses 'list' for whether should append to output.
*/ */
function end_el( &$output, $cat, $depth = 0, $args = array() ) { public function end_el( &$output, $cat, $depth = 0, $args = array() ) {
$output .= "</li>\n"; $output .= "</li>\n";
} }
/** /**
@ -112,47 +112,10 @@ class WC_Product_Cat_List_Walker extends Walker {
* @param string $output Passed by reference. Used to append additional content. * @param string $output Passed by reference. Used to append additional content.
* @return null Null on failure with no changes to parameters. * @return null Null on failure with no changes to parameters.
*/ */
function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ) { public function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) {
if ( ! $element || 0 === $element->count ) {
if ( !$element )
return; return;
$id_field = $this->db_fields['id'];
//display this element
if ( is_array( $args[0] ) )
$args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
$cb_args = array_merge( array(&$output, $element, $depth), $args);
call_user_func_array(array(&$this, 'start_el'), $cb_args);
$id = $element->$id_field;
// descend only when the depth is right and there are children for this element
if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {
foreach( $children_elements[ $id ] as $child ){
if ( !isset($newlevel) ) {
$newlevel = true;
//start the child delimiter
$cb_args = array_merge( array(&$output, $depth), $args);
call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
}
$this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
}
unset( $children_elements[ $id ] );
} }
parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
if ( isset($newlevel) && $newlevel ){
//end the child delimiter
$cb_args = array_merge( array(&$output, $depth), $args);
call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
}
//end this element
$cb_args = array_merge( array(&$output, $element, $depth), $args);
call_user_func_array(array(&$this, 'end_el'), $cb_args);
} }
} }