lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-22 03:37:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removing unused Default MenuItem attribute

Browse Source 
--HG--
branch : dev
extra : transplant_source : V%04K%3A%03vLz%8AJ%11%D7%E4%0B%92%7C%FA%A7%0B%07
This commit is contained in:
Louis DeJardin
2011-02-24 18:23:56 -08:00
parent 87e689039d
commit faa05aa9e7
5 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml
View File

@@ -18,10 +18,7 @@
string sectionHeaderText = firstLevelMenuItem.Text; string sectionHeaderText = firstLevelMenuItem.Text;
string sectionHeaderTextHint = firstLevelMenuItem.TextHint; string sectionHeaderTextHint = firstLevelMenuItem.TextHint;
var firstOfTheSecond = secondLevelMenuItems.FirstOrDefault(menuItem => menuItem.Default); var firstOfTheSecond = secondLevelMenuItems.FirstOrDefault();
if (firstOfTheSecond == null) {
firstOfTheSecond = secondLevelMenuItems.FirstOrDefault();
}
var itemClassName = HasText(sectionHeaderTextHint) var itemClassName = HasText(sectionHeaderTextHint)
? "navicon-" + sectionHeaderTextHint.HtmlClassify() ? "navicon-" + sectionHeaderTextHint.HtmlClassify()

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

@@ -199,7 +199,6 @@ namespace Orchard.UI.Navigation {
.Href(menuItem.Href) .Href(menuItem.Href)
.LinkToFirstChild(menuItem.LinkToFirstChild) .LinkToFirstChild(menuItem.LinkToFirstChild)
.LocalNav(menuItem.LocalNav) .LocalNav(menuItem.LocalNav)
.Default(menuItem.Default)
.Selected(menuItem.Selected) .Selected(menuItem.Selected)
.RouteValues(menuItem.RouteValues) .RouteValues(menuItem.RouteValues)
.Item(menuItem) .Item(menuItem)
@@ -223,7 +222,6 @@ namespace Orchard.UI.Navigation {
.Href(menuItem.Href) .Href(menuItem.Href)
.LinkToFirstChild(menuItem.LinkToFirstChild) .LinkToFirstChild(menuItem.LinkToFirstChild)
.LocalNav(menuItem.LocalNav) .LocalNav(menuItem.LocalNav)
.Default(menuItem.Default)
.Selected(menuItem.Selected) .Selected(menuItem.Selected)
.RouteValues(menuItem.RouteValues) .RouteValues(menuItem.RouteValues)
.Item(menuItem) .Item(menuItem)

1
src/Orchard/UI/Navigation/MenuItem.cs
View File

@@ -18,7 +18,6 @@ namespace Orchard.UI.Navigation {
public string Position { get; set; } public string Position { get; set; }
public bool LinkToFirstChild { get; set; } public bool LinkToFirstChild { get; set; }
public bool LocalNav { get; set; } public bool LocalNav { get; set; }
public bool Default { get; set; }
public bool Selected { get; set; } public bool Selected { get; set; }
public RouteValueDictionary RouteValues { get; set; } public RouteValueDictionary RouteValues { get; set; }
public IEnumerable<MenuItem> Items { get; set; } public IEnumerable<MenuItem> Items { get; set; }

5
src/Orchard/UI/Navigation/NavigationItemBuilder.cs
View File

@@ -50,11 +50,6 @@ namespace Orchard.UI.Navigation {
return this; return this;
} }
public NavigationItemBuilder Default(bool value = true) {
_item.Default = value;
return this;
}
public new IEnumerable<MenuItem> Build() { public new IEnumerable<MenuItem> Build() {
_item.Items = base.Build(); _item.Items = base.Build();
return new[] { _item }; return new[] { _item };

2
src/Orchard/UI/Navigation/NavigationManager.cs
View File

@@ -73,7 +73,6 @@ namespace Orchard.UI.Navigation {
Position = item.Position, Position = item.Position,
RouteValues = item.RouteValues, RouteValues = item.RouteValues,
LocalNav = item.LocalNav, LocalNav = item.LocalNav,
Default = item.Default,
Text = item.Text, Text = item.Text,
TextHint = item.TextHint, TextHint = item.TextHint,
IdHint = item.IdHint, IdHint = item.IdHint,
@@ -133,7 +132,6 @@ namespace Orchard.UI.Navigation {
LinkToFirstChild = items.First().LinkToFirstChild, LinkToFirstChild = items.First().LinkToFirstChild,
RouteValues = items.Select(x => x.RouteValues).FirstOrDefault(x => x != null), RouteValues = items.Select(x => x.RouteValues).FirstOrDefault(x => x != null),
LocalNav = items.Any(x => x.LocalNav), LocalNav = items.Any(x => x.LocalNav),
Default = items.First().Default,
Items = Merge(items.Select(x => x.Items)).ToArray(), Items = Merge(items.Select(x => x.Items)).ToArray(),
Position = SelectBestPositionValue(items.Select(x => x.Position)), Position = SelectBestPositionValue(items.Select(x => x.Position)),
Permissions = items.SelectMany(x => x.Permissions).Distinct(), Permissions = items.SelectMany(x => x.Permissions).Distinct(),