lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updating how Selected axis is matched

Browse Source 
--HG--
branch : dev
extra : transplant_source : %E9%F1oj%A1%AB%0E%F5%ED%D22%A8%A5%1ExAf%81%40%B9
This commit is contained in:
Louis DeJardin
2011-02-24 18:15:40 -08:00
parent 1dd2526b2e
commit 87e689039d
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Orchard/UI/Navigation/MenuFilter.cs
View File

@@ -48,7 +48,7 @@ namespace Orchard.UI.Navigation {
IEnumerable<string> menuImageSets = _navigationManager.BuildImageSets(menuName);
if (menuImageSets != null && menuImageSets.Count() > 0)
menuShape.ImageSets(menuImageSets);
workContext.Layout.Navigation.Add(menuShape);
// Populate local nav
@@ -118,22 +118,23 @@ namespace Orchard.UI.Navigation {
/// <param name="currentRouteData">The current route data.</param>
/// <returns>A stack with the selection path being the last node the currently selected one.</returns>
protected static Stack<MenuItem> SetSelectedPath(IEnumerable<MenuItem> menuItems, RouteData currentRouteData) {
foreach(MenuItem menuItem in menuItems) {
if (RouteMatches(menuItem, currentRouteData)) {
menuItem.Selected = true;
if (menuItems == null)
return null;
Stack<MenuItem> selectedPath = new Stack<MenuItem>();
foreach (MenuItem menuItem in menuItems) {
Stack<MenuItem> selectedPath = SetSelectedPath(menuItem.Items, currentRouteData);
if (selectedPath != null) {
menuItem.Selected = true;
selectedPath.Push(menuItem);
return selectedPath;
}
if (menuItem.Items != null && menuItem.Items.Any()) {
Stack<MenuItem> selectedPath = SetSelectedPath(menuItem.Items, currentRouteData);
if (selectedPath != null) {
menuItem.Selected = true;
selectedPath.Push(menuItem);
return selectedPath;
}
if (RouteMatches(menuItem.RouteValues, currentRouteData.Values)) {
menuItem.Selected = true;
selectedPath = new Stack<MenuItem>();
selectedPath.Push(menuItem);
return selectedPath;
}
}
@@ -166,14 +167,20 @@ namespace Orchard.UI.Navigation {
/// <summary>
/// Determines if a menu item corresponds to a given route.
/// </summary>
/// <param name="menuItem">The menu item.</param>
/// <param name="currentRouteData">The route data.</param>
/// <param name="itemValues">The menu item.</param>
/// <param name="requestValues">The route data.</param>
/// <returns>True if the menu item's action corresponds to the route data; false otherwise.</returns>
protected static bool RouteMatches(MenuItem menuItem, RouteData currentRouteData) {
return menuItem.RouteValues != null &&
string.Equals((string) menuItem.RouteValues["area"], (string) currentRouteData.Values["area"], StringComparison.OrdinalIgnoreCase) &&
string.Equals((string) menuItem.RouteValues["controller"], (string) currentRouteData.Values["controller"], StringComparison.OrdinalIgnoreCase) &&
string.Equals((string) menuItem.RouteValues["action"], (string) currentRouteData.Values["action"], StringComparison.OrdinalIgnoreCase);
protected static bool RouteMatches(RouteValueDictionary itemValues, RouteValueDictionary requestValues) {
if (itemValues == null && requestValues == null) {
return true;
}
if (itemValues == null || requestValues == null) {
return false;
}
if (itemValues.Keys.Any(key => requestValues.ContainsKey(key) == false)) {
return false;
}
return itemValues.Keys.All(key => string.Equals(Convert.ToString(itemValues[key]), Convert.ToString(requestValues[key]), StringComparison.OrdinalIgnoreCase));
}
/// <summary>