Fix known issues (theme-next#1213)

tongluyang · Oct 19, 2019 · e7e0d6c · e7e0d6c
1 parent 0a3f3c3
commit e7e0d6c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/layout/_partials/sidebar/site-overview.swig b/layout/_partials/sidebar/site-overview.swig
@@ -85,11 +85,15 @@
  {%- for name, link in theme.social %}
  <span class="links-of-author-item">
  {%- set sidebarURL = link.split('||')[0] | trim %}
- {%- if not (theme.social_icons.enable) or (not theme.social_icons.icons_only) %}
- {%- set sidebarText = name %}
- {%- endif %}
  {%- if theme.social_icons.enable %}
  {%- set sidebarIcon = '<i class="fa fa-fw fa-' + link.split('||')[1] | trim + '"></i>' %}
+ {%- else %}
+ {%- set sidebarIcon = '' %}
+ {%- endif %}
+ {%- if theme.social_icons.enable and theme.social_icons.icons_only %}
+ {%- set sidebarText = '' %}
+ {%- else %}
+ {%- set sidebarText = name %}
  {%- endif %}
  {{ next_url(sidebarURL, sidebarIcon + sidebarText, {title: name + ' &rarr; ' + sidebarURL}) }}
  </span>

diff --git a/source/js/utils.js b/source/js/utils.js
@@ -276,7 +276,7 @@ NexT.utils = {
  index = sections.indexOf(entry.target);
  return index === 0 ? 0 : index - 1;
  }
- for (;index < entries.length; index++) {
+ for (; index < entries.length; index++) {
  if (entries[index].boundingClientRect.top <= 0) {
  entry = entries[index];
  } else {
@@ -301,7 +301,9 @@ NexT.utils = {
  rootMargin: marginTop + 'px 0px -100% 0px',
  threshold : 0
  });
- sections.forEach(item => intersectionObserver.observe(item));
+ sections.forEach(item => {
+ item && intersectionObserver.observe(item);
+ });
  }
  createIntersectionObserver(document.documentElement.scrollHeight);
  },