Skip to content

Commit c18630f

Browse files
committed
Removed usage of circular members in nav_item partial
1 parent fb0c27c commit c18630f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

material/templates/partials/nav-item.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</a>
4141
{% endif %}
4242
{% endmacro %}
43-
{% macro render(nav_item, path, level) %}
43+
{% macro render(nav_item, path, level, parent) %}
4444
{% set class = "md-nav__item" %}
4545
{% if nav_item.active %}
4646
{% set class = class ~ " md-nav__item--active" %}
@@ -66,7 +66,7 @@
6666
{% set is_section = true %}
6767
{% endif %}
6868
{% if "navigation.sections" in features %}
69-
{% if level == 2 and nav_item.parent.active %}
69+
{% if level == 2 and parent.active %}
7070
{% set class = class ~ " md-nav__item--section" %}
7171
{% set is_section = true %}
7272
{% endif %}
@@ -116,9 +116,9 @@
116116
{{ nav_item.title }}
117117
</label>
118118
<ul class="md-nav__list" data-md-scrollfix>
119-
{% for nav_item in nav_item.children %}
120-
{% if not index or nav_item != index %}
121-
{{ render(nav_item, path ~ "_" ~ loop.index, level + 1) }}
119+
{% for item in nav_item.children %}
120+
{% if not index or item != index %}
121+
{{ render(item, path ~ "_" ~ loop.index, level + 1, nav_item) }}
122122
{% endif %}
123123
{% endfor %}
124124
</ul>

src/templates/partials/nav-item.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
{% endmacro %}
8888

8989
<!-- Render navigation item -->
90-
{% macro render(nav_item, path, level) %}
90+
{% macro render(nav_item, path, level, parent) %}
9191

9292
<!-- Determine classes -->
9393
{% set class = "md-nav__item" %}
@@ -129,7 +129,7 @@
129129
{% if "navigation.sections" in features %}
130130

131131
<!-- Render 2nd level items with nested items as sections -->
132-
{% if level == 2 and nav_item.parent.active %}
132+
{% if level == 2 and parent.active %}
133133
{% set class = class ~ " md-nav__item--section" %}
134134
{% set is_section = true %}
135135
{% endif %}
@@ -226,9 +226,9 @@
226226
<ul class="md-nav__list" data-md-scrollfix>
227227

228228
<!-- Nested navigation item -->
229-
{% for nav_item in nav_item.children %}
230-
{% if not index or nav_item != index %}
231-
{{ render(nav_item, path ~ "_" ~ loop.index, level + 1) }}
229+
{% for item in nav_item.children %}
230+
{% if not index or item != index %}
231+
{{ render(item, path ~ "_" ~ loop.index, level + 1, nav_item) }}
232232
{% endif %}
233233
{% endfor %}
234234
</ul>

0 commit comments

Comments
 (0)