From faa05aa9e776118b5565d1740acef44be15fed6b Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Thu, 24 Feb 2011 18:23:56 -0800 Subject: [PATCH] Removing unused Default MenuItem attribute --HG-- branch : dev extra : transplant_source : V%04K%3A%03vLz%8AJ%11%D7%E4%0B%92%7C%FA%A7%0B%07 --- src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml | 5 +---- src/Orchard/UI/Navigation/MenuFilter.cs | 2 -- src/Orchard/UI/Navigation/MenuItem.cs | 1 - src/Orchard/UI/Navigation/NavigationItemBuilder.cs | 5 ----- src/Orchard/UI/Navigation/NavigationManager.cs | 2 -- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml index 0b3ee3fd7..0e6a5ef9b 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml @@ -18,10 +18,7 @@ string sectionHeaderText = firstLevelMenuItem.Text; string sectionHeaderTextHint = firstLevelMenuItem.TextHint; - var firstOfTheSecond = secondLevelMenuItems.FirstOrDefault(menuItem => menuItem.Default); - if (firstOfTheSecond == null) { - firstOfTheSecond = secondLevelMenuItems.FirstOrDefault(); - } + var firstOfTheSecond = secondLevelMenuItems.FirstOrDefault(); var itemClassName = HasText(sectionHeaderTextHint) ? "navicon-" + sectionHeaderTextHint.HtmlClassify() diff --git a/src/Orchard/UI/Navigation/MenuFilter.cs b/src/Orchard/UI/Navigation/MenuFilter.cs index 050e27cab..eaf37c5c6 100644 --- a/src/Orchard/UI/Navigation/MenuFilter.cs +++ b/src/Orchard/UI/Navigation/MenuFilter.cs @@ -199,7 +199,6 @@ namespace Orchard.UI.Navigation { .Href(menuItem.Href) .LinkToFirstChild(menuItem.LinkToFirstChild) .LocalNav(menuItem.LocalNav) - .Default(menuItem.Default) .Selected(menuItem.Selected) .RouteValues(menuItem.RouteValues) .Item(menuItem) @@ -223,7 +222,6 @@ namespace Orchard.UI.Navigation { .Href(menuItem.Href) .LinkToFirstChild(menuItem.LinkToFirstChild) .LocalNav(menuItem.LocalNav) - .Default(menuItem.Default) .Selected(menuItem.Selected) .RouteValues(menuItem.RouteValues) .Item(menuItem) diff --git a/src/Orchard/UI/Navigation/MenuItem.cs b/src/Orchard/UI/Navigation/MenuItem.cs index 6f74e5dd8..58ccdeb25 100644 --- a/src/Orchard/UI/Navigation/MenuItem.cs +++ b/src/Orchard/UI/Navigation/MenuItem.cs @@ -18,7 +18,6 @@ namespace Orchard.UI.Navigation { public string Position { get; set; } public bool LinkToFirstChild { get; set; } public bool LocalNav { get; set; } - public bool Default { get; set; } public bool Selected { get; set; } public RouteValueDictionary RouteValues { get; set; } public IEnumerable Items { get; set; } diff --git a/src/Orchard/UI/Navigation/NavigationItemBuilder.cs b/src/Orchard/UI/Navigation/NavigationItemBuilder.cs index 0306a9e8d..e0f3a3a69 100644 --- a/src/Orchard/UI/Navigation/NavigationItemBuilder.cs +++ b/src/Orchard/UI/Navigation/NavigationItemBuilder.cs @@ -50,11 +50,6 @@ namespace Orchard.UI.Navigation { return this; } - public NavigationItemBuilder Default(bool value = true) { - _item.Default = value; - return this; - } - public new IEnumerable Build() { _item.Items = base.Build(); return new[] { _item }; diff --git a/src/Orchard/UI/Navigation/NavigationManager.cs b/src/Orchard/UI/Navigation/NavigationManager.cs index 8adef2022..445f2fd96 100644 --- a/src/Orchard/UI/Navigation/NavigationManager.cs +++ b/src/Orchard/UI/Navigation/NavigationManager.cs @@ -73,7 +73,6 @@ namespace Orchard.UI.Navigation { Position = item.Position, RouteValues = item.RouteValues, LocalNav = item.LocalNav, - Default = item.Default, Text = item.Text, TextHint = item.TextHint, IdHint = item.IdHint, @@ -133,7 +132,6 @@ namespace Orchard.UI.Navigation { LinkToFirstChild = items.First().LinkToFirstChild, RouteValues = items.Select(x => x.RouteValues).FirstOrDefault(x => x != null), LocalNav = items.Any(x => x.LocalNav), - Default = items.First().Default, Items = Merge(items.Select(x => x.Items)).ToArray(), Position = SelectBestPositionValue(items.Select(x => x.Position)), Permissions = items.SelectMany(x => x.Permissions).Distinct(),