github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

navigation: Unexport menu entry methods

Browse source 
- MenuEntry.IsEqual
- MenuEntry.IsSameResource

Closes #11670
This commit is contained in:
Joe Mooring 2023-11-07 20:23:45 -08:00 committed by Bjørn Erik Pedersen
parent 805cc1773b
commit 80d2fdbaa0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navigation/menu.go
View file

@ -124,14 +124,14 @@ func (m *MenuEntry) hopefullyUniqueID() string {
} }
} }
// IsEqual returns whether the two menu entries represents the same menu entry. // isEqual returns whether the two menu entries represents the same menu entry.
func (m *MenuEntry) IsEqual(inme *MenuEntry) bool { func (m *MenuEntry) isEqual(inme *MenuEntry) bool {
return m.hopefullyUniqueID() == inme.hopefullyUniqueID() && m.Parent == inme.Parent return m.hopefullyUniqueID() == inme.hopefullyUniqueID() && m.Parent == inme.Parent
} }
// IsSameResource returns whether the two menu entries points to the same // isSameResource returns whether the two menu entries points to the same
// resource (URL). // resource (URL).
func (m *MenuEntry) IsSameResource(inme *MenuEntry) bool { func (m *MenuEntry) isSameResource(inme *MenuEntry) bool {
if m.isSamePage(inme.Page) { if m.isSamePage(inme.Page) {
return m.Page == inme.Page return m.Page == inme.Page
} }

8
navigation/pagemenus.go
View file

@ -138,7 +138,7 @@ func (pm *pageMenus) HasMenuCurrent(menuID string, me *MenuEntry) bool {
if m, ok := menus[menuID]; ok { if m, ok := menus[menuID]; ok {
for _, child := range me.Children { for _, child := range me.Children {
if child.IsEqual(m) { if child.isEqual(m) {
return true return true
} }
if pm.HasMenuCurrent(menuID, child) { if pm.HasMenuCurrent(menuID, child) {
@ -168,7 +168,7 @@ func (pm *pageMenus) IsMenuCurrent(menuID string, inme *MenuEntry) bool {
menus := pm.pagem.Menus() menus := pm.pagem.Menus()
if me, ok := menus[menuID]; ok { if me, ok := menus[menuID]; ok {
if me.IsEqual(inme) { if me.isEqual(inme) {
return true return true
} }
} }
@ -185,7 +185,7 @@ func (pm *pageMenus) IsMenuCurrent(menuID string, inme *MenuEntry) bool {
// Search for it to make sure that it is in the menu with the given menuId. // Search for it to make sure that it is in the menu with the given menuId.
if menu, ok := pm.sitem.Menus()[menuID]; ok { if menu, ok := pm.sitem.Menus()[menuID]; ok {
for _, menuEntry := range menu { for _, menuEntry := range menu {
if menuEntry.IsSameResource(inme) { if menuEntry.isSameResource(inme) {
return true return true
} }
@ -203,7 +203,7 @@ func (pm *pageMenus) IsMenuCurrent(menuID string, inme *MenuEntry) bool {
func (pm *pageMenus) isSameAsDescendantMenu(inme *MenuEntry, parent *MenuEntry) bool { func (pm *pageMenus) isSameAsDescendantMenu(inme *MenuEntry, parent *MenuEntry) bool {
if parent.HasChildren() { if parent.HasChildren() {
for _, child := range parent.Children { for _, child := range parent.Children {
if child.IsSameResource(inme) { if child.isSameResource(inme) {
return true return true
} }
descendantFound := pm.isSameAsDescendantMenu(inme, child) descendantFound := pm.isSameAsDescendantMenu(inme, child)