Skip to content

Commit

Permalink
Don't add invalid empty target element to navigation links (#16341)
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahelsaig authored Jun 18, 2024
1 parent 7a14fd9 commit 22fbbb4
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
url = Url.Content(linkMenuItemPart.Url);
}

tag.Attributes["target"] = linkMenuItemPart.Target;
if (!string.IsNullOrEmpty(linkMenuItemPart.Target))
{
tag.Attributes["target"] = linkMenuItemPart.Target;
}

tag.Attributes["href"] = url;
tag.InnerHtml.Append(contentItem.DisplayText);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
{% assign link = Model.ContentItem.Content.HtmlMenuItemPart %}
<a class="nav-link" href="{{ link.Url | href }}" target="{{ link.Target }}">{{ link.Html | raw }}</a>
<a class="nav-link" href="{{ link.Url | href }}"
{% if link.Target != null and link.Target != "" %}
target="{{ link.Target }}"
{% endif %}>{{ link.Html | raw }}</a>
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{% assign link = Model.ContentItem.Content.LinkMenuItemPart %}
<a class="nav-link" href="{{ link.Url | href }}" target="{{ link.Target }}"
<a class="nav-link" href="{{ link.Url | href }}"
{% if link.Target != null and link.Target != "" %}
target="{{ link.Target }}"
{% endif %}
{% if link.Url contains "#" %}
data-bs-target="{{ link.Url | split: '/' | last }}"
{% endif %}>
{{ Model.ContentItem.DisplayText }}</a>
{% endif %}>{{ Model.ContentItem.DisplayText }}</a>
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
{% if Model.HasItems %}
<a href="{{ link.Url | href }}" class="nav-link px-lg-3 py-3 py-lg-4 dropdown-toggle" data-bs-toggle="dropdown">{{ link.Html | raw }}<b class="caret"></b></a>
{% else %}
<a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}" target="{{ link.Target }}">{{ link.Html | raw }}</a>
<a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}"
{% if link.Target != null and link.Target != "" %}
target="{{ link.Target }}"
{% endif %}>{{ link.Html | raw }}</a>
{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
{% if Model.HasItems %}
<a href="{{ link.Url | href }}" class="nav-link px-lg-3 py-3 py-lg-4 dropdown-toggle" data-bs-toggle="dropdown">{{ Model.ContentItem.DisplayText }}<b class="caret"></b></a>
{% else %}
<a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}" target="{{ link.Target }}">{{ Model.ContentItem.DisplayText }}</a>
<a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}"
{% if link.Target != null and link.Target != "" %}
target="{{ link.Target }}"
{% endif %}>{{ Model.ContentItem.DisplayText }}</a>
{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public NavigationItemBuilder Url(string url)
public NavigationItemBuilder Target(string target)
{
_item.Target = target;

return this;
}

Expand Down

0 comments on commit 22fbbb4

Please sign in to comment.