Skip to content

Commit

Permalink
Fix deprecation warning
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed Jan 2, 2017
1 parent 232e997 commit 9e6d347
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions material/partials/nav-item.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
</li>
{% elif nav_item == page %}
<li class="md-nav__item">
{% set toc = page.toc %}
{% set toc_ = page.toc %}
<input class="md-toggle md-nav__toggle" data-md-toggle="toc" type="checkbox" id="toc">
{% if "\x3ch1 id=" in page.content %}
{% set toc = (toc | first).children %}
{% set toc_ = (toc_ | first).children %}
{% endif %}
{% if toc and (toc | first) %}
{% if toc_ and (toc_ | first) %}
<label class="md-nav__link md-nav__link--active" for="toc">
{{ nav_item.title }}
</label>
Expand Down
8 changes: 4 additions & 4 deletions material/partials/toc.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<nav class="md-nav md-nav--secondary">
{% set toc = page.toc %}
{% set toc_ = page.toc %}
{% if "\x3ch1 id=" in page.content %}
{% set toc = (toc | first).children %}
{% set toc_ = (toc_ | first).children %}
{% endif %}
{% if toc and (toc | first) %}
{% if toc_ and (toc_ | first) %}
<label class="md-nav__title" for="toc">Table of contents</label>
<ul class="md-nav__list" data-md-scrollfix>
{% for toc_item in toc %}
{% for toc_item in toc_ %}
{% include "partials/toc-item.html" %}
{% endfor %}
</ul>
Expand Down
6 changes: 3 additions & 3 deletions src/partials/nav-item.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@
<!-- Currently active page -->
{% elif nav_item == page %}
<li class="md-nav__item">
{% set toc = page.toc %}
{% set toc_ = page.toc %}

<!-- Active checkbox expands items contained within nested section -->
<input class="md-toggle md-nav__toggle" data-md-toggle="toc"
type="checkbox" id="toc" />

<!-- Nasty hack - see partials/toc.html for more information -->
{% if "\x3ch1 id=" in page.content %}
{% set toc = (toc | first).children %}
{% set toc_ = (toc_ | first).children %}
{% endif %}

<!-- Render table of contents, if not empty -->
{% if toc and (toc | first) %}
{% if toc_ and (toc_ | first) %}
<label class="md-nav__link md-nav__link--active" for="toc">
{{ nav_item.title }}
</label>
Expand Down
8 changes: 4 additions & 4 deletions src/partials/toc.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<!-- Table of contents -->
<nav class="md-nav md-nav--secondary">
{% set toc = page.toc %}
{% set toc_ = page.toc %}

<!--
This is a nasty hack that checks whether the content contains a h1
Expand All @@ -31,14 +31,14 @@
anchor. Therefore we directly continue with the children of the anchor.
-->
{% if "\x3ch1 id=" in page.content %}
{% set toc = (toc | first).children %}
{% set toc_ = (toc_ | first).children %}
{% endif %}

<!-- Render item list -->
{% if toc and (toc | first) %}
{% if toc_ and (toc_ | first) %}
<label class="md-nav__title" for="toc">Table of contents</label>
<ul class="md-nav__list" data-md-scrollfix>
{% for toc_item in toc %}
{% for toc_item in toc_ %}
{% include "partials/toc-item.html" %}
{% endfor %}
</ul>
Expand Down

0 comments on commit 9e6d347

Please sign in to comment.