remove AJAX callback, pass menu structure to page directly, dramatically faster, 1 less HTTP request, clear your menu cache, can produce weirdness/infinit loops

This commit is contained in:
Ted Serbinski 2007-04-07 03:57:43 +00:00
parent ccd2494fb7
commit ec97ad2402
2 changed files with 56 additions and 60 deletions

View File

@ -21,12 +21,11 @@ $(document).ready(function() {
$('body').css('margin-top', '23px');
// Drupal menu callback
$('#simplemenu').load(basePath + 'simplemenu/menu', function() {
$('li', this).hover(function() {
$('ul', this).slideDown(200);
}, function() {});
$('a', this).title('');
$(this).children('li.expanded').addClass('root');
});
// Build menu
$('#simplemenu').append(simplemenu);
$('#simplemenu li').hover(function() {
$('ul', this).slideDown(200);
}, function() {});
$('#simplemenu a').title('');
$('#simplemenu').children('li.expanded').addClass('root');
});

View File

@ -12,14 +12,7 @@
function simplemenu_menu($may_cache) {
$items = array();
if ($may_cache) {
$items[] = array(
'path' => 'simplemenu/menu',
'access' => user_access('view simplemenu'),
'callback' => 'simplemenu_get_menu',
'type' => MENU_CALLBACK
);
if ($may_cache) {
$items[] = array(
'path' => 'admin/settings/simplemenu',
'title' => t('SimpleMenu'),
@ -57,6 +50,7 @@ function simplemenu_footer() {
);
drupal_add_js(array('simplemenu' => $settings), 'setting');
drupal_add_js('var simplemenu = '. drupal_to_js(simplemenu_get_menu() .';'), 'inline');
drupal_add_js($path .'/simplemenu.js');
}
}
@ -129,6 +123,53 @@ function simplemenu_admin_settings() {
return system_settings_form($form);
}
/**
* Render an HTML list of links for a given menu.
*/
function simplemenu_get_menu() {
$output = '';
$menu = simplemenu_menu_tree(variable_get('simplemenu_menu', 1));
if (!$menu) {
$menu = '<li><a href="'. url('admin/settings/simplemenu') .'">'. t('No menu items found. Try a different menu as the default.') .'</a></li>';
}
$output .= simplemenu_get_devel();
$output .= $menu;
return $output;
}
/**
* Custom implementation of menu_tree().
* We want to retrieve the entire menu structure for a given menu,
* regardless of whether or not the menu item is expanded or not.
*/
function simplemenu_menu_tree($pid = 1) {
$menu = menu_get_menu();
$output = '';
if (isset($menu['visible'][$pid]) && $menu['visible'][$pid]['children']) {
foreach ($menu['visible'][$pid]['children'] as $mid) {
$type = isset($menu['visible'][$mid]['type']) ? $menu['visible'][$mid]['type'] : NULL;
$children = isset($menu['visible'][$mid]['children']) ? $menu['visible'][$mid]['children'] : NULL;
$output .= theme('menu_item', $mid, simplemenu_theme_menu_tree($mid), count($children) == 0);
}
}
return $output;
}
/**
* Custom implementation of theme_menu_tree() to call our custom menu above.
*/
function simplemenu_theme_menu_tree($pid = 1) {
if ($tree = simplemenu_menu_tree($pid)) {
return '<ul>'. $tree .'</ul>';
}
}
/**
* Return a list of devel module links if the module is enabled
* and the user has access to this module.
@ -159,48 +200,4 @@ function simplemenu_get_devel() {
}
return $output;
}
/**
* Custom implementation of menu_tree().
* We want to retrieve the entire menu structure for a given menu,
* regardless of whether or not the menu item is expanded or not.
*/
function simplemenu_menu_tree($pid = 1) {
$menu = menu_get_menu();
$output = '';
if (isset($menu['visible'][$pid]) && $menu['visible'][$pid]['children']) {
foreach ($menu['visible'][$pid]['children'] as $mid) {
$type = isset($menu['visible'][$mid]['type']) ? $menu['visible'][$mid]['type'] : NULL;
$children = isset($menu['visible'][$mid]['children']) ? $menu['visible'][$mid]['children'] : NULL;
$output .= theme('menu_item', $mid, simplemenu_theme_menu_tree($mid), count($children) == 0);
}
}
return $output;
}
/**
* Custom implementation of theme_menu_tree() to call our custom menu above.
*/
function simplemenu_theme_menu_tree($pid = 1) {
if ($tree = simplemenu_menu_tree($pid)) {
return '<ul>'. $tree .'</ul>';
}
}
/**
* AJAX menu callback to return an HTML list of links for a given menu.
*/
function simplemenu_get_menu() {
$menu = simplemenu_menu_tree(variable_get('simplemenu_menu', 1));
if (!$menu) {
$menu = '<li><a href="'. url('admin/settings/simplemenu') .'">'. t('No menu items found. Try a different menu as the default.') .'</a></li>';
}
print simplemenu_get_devel();
print $menu;
exit;
}