Changeset 631788

Timestamp:

11/29/2012 02:31:49 PM (13 years ago)

Author:

davidmosterd

Message:

now it should be ok...

File:

• codepress-menu/tags/2.2/codepress-menu.php (modified) (10 diffs)

codepress-menu/tags/2.2/codepress-menu.php

@@ -3 +3 @@
 Plugin Name:        Codepress Menu
 Plugin URI:         http://wordpress.org/extend/plugins/codepress-menu/
-Version:            2.1.2
+Version:            2.2
 Description:        A more flexible take on displaying a WordPress menu in your theme
 Author:             David Mosterd
@@ -24 +24 @@
 */
 
-require_once 'codepress-menu-item.php';
-
-class Codepress_Walker_Nav_Menu extends Walker_Nav_Menu
-{
+class Codepress_Walker_Nav_Menu extends Walker_Nav_Menu {
+    
     /**
      * Indents any object as long as it has a unique id and that of its parent.
@@ -33 +31 @@
      * @since 2.1
      */
-    protected function indent( array $items, $parentId = 0 ) 
-    {        
-        extract($this->db_fields);
+    protected function indent( array $items, $parent_id = 0 ) {        
+        extract( $this->db_fields );
         
         $indent = array();
 
-        foreach($items as $v) {
-            if ($v->$parent == $parentId) {
-                $v->setChildren( $this->indent($items, $v->$id) );
+        foreach( $items as $item ) {
+            if ( $item->$parent == $parent_id ) {
+                $item->children = $this->indent( $items, $item->$id );
                 
-                $indent[] = $v;
+                $indent[] = $item;
             }
         }
@@ -55 +52 @@
      * @since 2.0
      */
-    protected function level(array $items, $level, $reached = 1, $currentBranch = false) 
-    { 
-        foreach ( $items as $item ) {
+    protected function level( $items, $level, $reached = 1, $currentBranch = false)  { 
+        
+        foreach ( $items as $item ) {
             
             // check for current or ancestor
-            if ( $item->isCurrent() || $item->isAncestor() || $currentBranch ) {
+            if ( $item->current || $item->current_item_ancestor || $currentBranch ) {
                  
                 // catch top level
                 if ( $level == 1 && $reached == 1 ) {
-                    return array($item);
+                    return array( $item );
                 }
 
                 // catch all other levels
-                if ( ++$reached == $level && $item->hasChildren() ) {
-                    return $item->getChildren();
+                if ( $reached + 1 == $level && ! empty( $item->children ) ) {
+                    return $item->children;
                 }
                 
-                if ( $item->hasChildren() ) {
-                   return $this->level($item->getChildren(), $level, $reached, true);
+                if ( ! empty( $item->children ) ) {
+                   return $this->level( $item->children, $level, $reached + 1, true );
                 }
             }
@@ -86 +83 @@
      * @since 1.0
      */
-    protected function depth(array $items, $depth, $level = 1) 
-    {      
-        foreach($items as $item) {
-            // unset the children
-            if ($depth == $level) {
-                $item->unsetChildren();
-            }
-                        
-            // if still filled, go a level deeper
-            if ( $item->hasChildren() ) {
-                $item->setChildren( $this->depth($item->getChildren(), $depth, $level + 1) );
-            }
+    protected function depth( $items, $depth, $level = 1 ) {  
+        
+        foreach( $items as $k => $item ) {
+            // unset the children, or go a level deeper
+            if ( $depth == $level )
+                unset( $items[$k]->children );
+            elseif ( ! empty( $item->children ) )
+                $items[$k]->children = $this->depth( $item->children, $depth, $level + 1 );
         }
         
-        return $items;
+        return $items;
     }
     
@@ -108 +101 @@
      * @since 2.1
      */
-    protected function markHeadAndTail(array $items)
-    {        
+    protected function mark_first_and_last( array $items ) {        
         $i = 0;
         
-        foreach($items as $item) {
+        foreach( $items as $item ) {
             if ( $i == 0 ) {
-                $item->addClass('first');
+                $item->classes[] = 'first';
             }
             
             $i++;
             
-            if ( $i == count($items) ) {
-                $item->addClass('last');
-            }
-            
-            if ( $item->hasChildren() ) {
-                $item->setChildren( $this->markHeadAndTail($item->children) );
+            if ( $i == count( $items ) ) {
+                $item->classes[] = 'last';
+            }
+            
+            if ( ! empty( $item->children ) ) {
+                $item->children = $this->mark_first_and_last( $item->children );
             }
         }
@@ -130 +122 @@
         return $items;
     }
+    
+    /**
+     * Sanitize classes by removing some of them and renaming others.
+     *
+     * @since 2.1.1
+     */
+    protected function sanitize_classes( $items, $args ) {
+        
+        foreach( $items as $k => $item ) {
+        
+            // always allow custom assigned classes
+            $filtered = (array) get_post_meta( $item->ID, '_menu_item_classes', true );
+
+            $allowed = array();
+
+            if ( $args->classes == 'minimal' || $args->classes == 'simple' ) {
+                $allowed = array(
+                    'current-menu-item'     => 'current',
+                    'current-menu-parent'   => 'current-parent',
+                    'current-menu-ancestor' => 'current-ancestor',
+                );
+            }
+
+            if ( $args->classes == 'sanitize' ) {
+                $allowed = array(
+                    'current-menu-item',
+                    'current-menu-parent',
+                    'current-menu-ancestor',
+                );
+            }
+
+            if ( $args->classes == 'simple' || $args->classes == 'sanitize' ) {
+                $allowed = array_merge( $allowed, array( 'first', 'last' ) );     
+            }
+
+            $allowed = apply_filters( 'codepress_menu_filter_classes', $allowed, $item, $args );
+            
+            // check for class that is allowed, but needs transformation
+            foreach ( $item->classes as $class ) { 
+                if ( array_key_exists( $class, $allowed ) ) { 
+                    $filtered[] = $allowed[$class];
+                } elseif ( in_array( $class, $allowed ) ) { 
+                    $filtered[] = $class;
+                }
+            }
+            
+            $items[$k]->classes = array_filter( $filtered );;
+        }
+        
+        return $items;
+    }
     
     /**
@@ -136 +179 @@
      * @since 2.1
      */
-    public function walk($items, $depth, $args) 
-    {   
-        // check if wp_nav_menu_objects fired
-        if ( !( current($items) instanceof Codepress_Menu_Item ) ) {
-            return '';
-        }
-        
-        // a ordered list of filters to apply
-        $filters = array('indent', 'level', 'depth', 'markHeadAndTail');
-        
-        foreach($filters as $filter) {       
-            // check for filter arguments
-            switch($filter) {
-                case 'sanitize':
-                    if ( $args->sanitize ) {
-                        $items = $this->sanitize($items);
-                    }
-                    break;
-                case 'level':
-                    if ( $args->level > 0) {
-                        $items = $this->level($items, $args->level);
-                    }
-                    break;
-                case 'depth':
-                    $items = $this->depth($items, $args->depth);
-                    break;
-                default:
-                    $items = $this->$filter($items);
-            }
-        }
-        
-        return $this->getMenu($items, $args);
+    public function walk( $items, $depth, $args ) {          
+        
+        $items = $this->indent( $items );
+        
+        if ( $args->level )
+            $items = $this->level( $items, $args->level );
+        
+        $items = $this->depth( $items, $depth );
+        
+        if ( $args->classes ) {
+            $items = $this->mark_first_and_last( $items );
+            $items = $this->sanitize_classes( $items, $args );
+        }
+        
+        $items = apply_filters( 'codepress_menu_filter', $items );
+ 
+        return $this->get_menu( $items, $args );
     }
     
@@ -176 +204 @@
      * @since 1.0
      */
-    public function getMenu($items, $args, $level = 1)
-    {
+    public function get_menu( $items, $args, $level = 1 ) {
         $output = '';
         
         if ( $level > 1) {
-            $this->start_lvl($output, 0, $args);
-        }
-        
-        foreach($items as $item) {
-            $this->start_el($output, $item, 0, $args);
-            
-            if ( $item->hasChildren() ) {
-                $output .= $this->getMenu($item->getChildren(), $args, $level + 1);
-            }
-            
-            $this->end_el($output, $item, 0, $args);
+            $this->start_lvl( $output, 0, $args );
+        }
+        
+        foreach( $items as $item ) {
+            $this->start_el( $output, $item, 0, $args );
+            
+            if ( ! empty( $item->children ) ) {
+                $output .= $this->get_menu( $item->children, $args, $level + 1);
+            }
+            
+            $this->end_el( $output, $item, 0, $args );
         }
         
         if ( $level > 1 ) {
-            $this->end_lvl($output, 0, $args);
+            $this->end_lvl( $output, 0, $args );
         }
         
@@ -203 +230 @@
 
 /**
- * Sanitize classes
+ * Init Codepress Menu.
  * 
- * @return array 
+ * @uses apply_filters() To ignore certain theme_locations. 
+ * @since 1.0
  */
-function codepress_menu_item_sanitize_classes($classes, $item, $args)
-{
-    if ( $args->classes ) {
-        $classes = $item->filterClasses($classes, $args->classes);
-    }
-    
-    return $classes;
-}
-add_filter('nav_menu_css_class', 'codepress_menu_item_sanitize_classes', 10, 3);
-
-/**
- * Sanitize id
- * 
- * @return string 
- */
-function codepress_menu_item_sanitize_id($id, $item, $args) 
-{
-    if ( $args->classes ) {
-        $id = false;
-    }
-    
-    return $id;
-}
-add_filter('nav_menu_item_id', 'codepress_menu_item_sanitize_id', 10, 3);
-
-/**
- * Set codepress menu defaults
- * 
- */
-function codepress_menu_args($args)
-{
-    $default = array(
+function codepress_menu_init( $args ) {
+    $ignore = apply_filters( 'codepress_ignore_theme_locations', array() );
+    
+    if ( ! empty( $ignore ) && in_array( $args['theme_location'], $ignore ) )
+        return $args;    
+    
+    $defaults = array(
         'level'     => 0,
         'classes'   => false,
+        'walker'    => new Codepress_Walker_Nav_Menu,
     );
     
-    return array_merge( $default, $args );
-}
-add_filter('wp_nav_menu_args', 'codepress_menu_args', 10, 1);
-
-/**
- * Set codepress menu walker
- * 
- */
-function codepress_menu_set_walker($args)
-{
-    $args['walker'] = new Codepress_Walker_Nav_Menu();
+    foreach( $defaults as $option => $default ) {
+        if ( empty( $args[$option] ) )
+            $args[$option] = $default;
+    }
     
     return $args;
 }
-add_filter('wp_nav_menu_args', 'codepress_menu_set_walker', 5, 1);
-
-/**
- * Extend current menu item
- * 
- * @param array $items
- * @return \Codepress_Menu_Item 
- */
-function codepress_menu_items($items)
-{
-    $codepress_items = array();
-    
-    foreach($items as $item) {
-        $codepress_items[] = new Codepress_Menu_Item($item);
-    }
-    
-    return $codepress_items;
-}
-add_filter('wp_nav_menu_objects', 'codepress_menu_items', 10, 1);
-
-/**
- * Extend the minimal and sanitize class set with 'first' and 'last' to get :first-child and :last-child support in IE7+
- * Will drop once IE9+ is the standard
- * 
- * @param array $allowed
- * @param string $mode
- * @return array 
- */
-function codepress_menu_filter_classes($allowed, $mode) 
-{
-    if ( $mode == 'simple' || $mode == 'sanitize' ) {
-        $allowed[] = 'first';
-        $allowed[] = 'last';
-    }
-
-    return $allowed;
-}
-add_filter( 'codepress_menu_filter_classes', 'codepress_menu_filter_classes', 10, 2 );
-
-/**
- * Checks if the filters have not reduced the itemset to zero. If so, act as wp_nav_menu and return false.
- * 
- * @todo searching for li tag might break on a custom walker
- * @param string $nav_menu
- * @param array $args
- * @return boolean|string
- */
-function codepress_menu_return_false_on_empty_list_after_filters($nav_menu, $args) 
-{
-    if ( strpos($nav_menu, "</li>") === false ) {
-        return false;
-    }
-    
-    return $nav_menu;
-}
-add_filter( 'wp_nav_menu', 'codepress_menu_return_false_on_empty_list_after_filters', 10, 2 );
+add_filter( 'wp_nav_menu_args', 'codepress_menu_init' );