Refactor save_scroll (#1049)

theme-next · Aug 3, 2019 · 97ec251 · 97ec251
1 parent cb5c752
commit 97ec251
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 199 deletions.
diff --git a/_config.yml b/_config.yml
@@ -285,7 +285,7 @@ chat:
 # Automatically scroll page to section which is under <!-- more --> mark.
 scroll_to_more: true
 
-# Automatically saving scroll position on each post / page in cookies.
+# Automatically saving scroll position of each page in the browser.
 save_scroll: false
 
 # Automatically excerpt description in homepage as preamble text.

diff --git a/layout/_layout.swig b/layout/_layout.swig
@@ -88,7 +88,6 @@
  {% block script_extra %}{% endblock %}
 
  {% include '_scripts/next-boot.swig' %}
- {% include '_scripts/scroll-cookie.swig' %}
  {% include '_scripts/exturl.swig' %}
  {% include '_scripts/three.swig' %}
 

diff --git a/layout/_partials/head/head.swig b/layout/_partials/head/head.swig
@@ -101,6 +101,7 @@
  version: '{{ version }}',
  sidebar: {{ theme.sidebar | json_encode }},
  back2top: {{ theme.back2top | json_encode }},
+ save_scroll: {{ theme.save_scroll }},
  copycode: {{ theme.codeblock.copy_button | json_encode }},
  fancybox: {{ theme.fancybox }},
  mediumzoom: {{ theme.mediumzoom }},

diff --git a/layout/_scripts/scroll-cookie.swig b/layout/_scripts/scroll-cookie.swig
diff --git a/source/js/js.cookie.js b/source/js/js.cookie.js
diff --git a/source/js/next-boot.js b/source/js/next-boot.js
@@ -11,6 +11,7 @@ $(document).ready(function() {
  CONFIG.lazyload && window.lozad('.post-body img').observe();
  CONFIG.pangu && window.pangu.spacingPage();
 
+ CONFIG.save_scroll && NexT.utils.saveScroll();
  CONFIG.copycode.enable && NexT.utils.registerCopyCode();
  CONFIG.back2top.enable && NexT.utils.registerBackToTop();
  CONFIG.tabs && NexT.utils.registerTabsTag();

diff --git a/source/js/scroll-cookie.js b/source/js/scroll-cookie.js
diff --git a/source/js/utils.js b/source/js/utils.js
@@ -42,6 +42,26 @@ NexT.utils = {
  });
  },
 
+ saveScroll: function() {
+ // Set relative link path (without domain)
+ var rpath = window.location.pathname;
+
+ // Read position from localStorage
+ if (localStorage.getItem('scroll' + rpath) !== null) {
+ var cvalues = localStorage.getItem('scroll' + rpath);
+ $(window).scrollTop(cvalues);
+ }
+
+ // Write position in localStorage
+ var timeout;
+ $(window).on('scroll', function() {
+ clearTimeout(timeout);
+ timeout = setTimeout(function() {
+ localStorage.setItem('scroll' + rpath, $(window).scrollTop());
+ }, 250);
+ });
+ },
+
  /**
  * One-click copy code support.
  */