Move is_element_empty to nav.php

This commit is contained in:
Ben Word
2015-01-18 04:23:30 -06:00
parent eb8030abcc
commit 7016d92f07
2 changed files with 10 additions and 9 deletions

View File

@@ -52,6 +52,14 @@ class Sage_Nav_Walker extends \Walker_Nav_Menu {
} }
} }
/**
* Check if element is empty
*/
function is_element_empty($element) {
$element = trim($element);
return !empty($element);
}
/** /**
* Remove the id="" on nav menu items * Remove the id="" on nav menu items
* Return 'menu-slug' for nav menu classes * Return 'menu-slug' for nav menu classes
@@ -65,7 +73,7 @@ function nav_menu_css_class($classes, $item) {
$classes = array_unique($classes); $classes = array_unique($classes);
return array_filter($classes, 'Roots\\Sage\\Utils\\is_element_empty'); return array_filter($classes, __NAMESPACE__ . '\\is_element_empty');
} }
add_filter('nav_menu_css_class', __NAMESPACE__ . '\\nav_menu_css_class', 10, 2); add_filter('nav_menu_css_class', __NAMESPACE__ . '\\nav_menu_css_class', 10, 2);
add_filter('nav_menu_item_id', '__return_null'); add_filter('nav_menu_item_id', '__return_null');

View File

@@ -3,14 +3,8 @@
namespace Roots\Sage\Utils; namespace Roots\Sage\Utils;
/** /**
* Utility functions * Tell WordPress to use searchform.php from the templates/ directory
*/ */
function is_element_empty($element) {
$element = trim($element);
return !empty($element);
}
// Tell WordPress to use searchform.php from the templates/ directory
function get_search_form() { function get_search_form() {
$form = ''; $form = '';
locate_template('/templates/searchform.php', true, false); locate_template('/templates/searchform.php', true, false);
@@ -22,7 +16,6 @@ add_filter('get_search_form', __NAMESPACE__ . '\\get_search_form');
* Add page slug to body_class() classes if it doesn't exist * Add page slug to body_class() classes if it doesn't exist
*/ */
function body_class($classes) { function body_class($classes) {
// Add post/page slug
if (is_single() || is_page() && !is_front_page()) { if (is_single() || is_page() && !is_front_page()) {
if (!in_array(basename(get_permalink()), $classes)) { if (!in_array(basename(get_permalink()), $classes)) {
$classes[] = basename(get_permalink()); $classes[] = basename(get_permalink());