feat: Add the config of scroll to second screen when pjax enabled

liuyib · Sep 13, 2019 · ec6ac43 · ec6ac43
1 parent ebf5d11
commit ec6ac43
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/_config.yml b/_config.yml
@@ -196,7 +196,7 @@ sidebar:
   # Horizon line.
   horizon_line: false
   # Suggest: 240px ~ 300px
-  width: 260px
+  width: 280px
 
 author:
   enable: true
@@ -620,6 +620,8 @@ quicklink:
 # See: https://github.com/MoOx/pjax/
 pjax:
   enable: false
+  # Scrolling to the second screen when the page loaded.
+  scrollTo2screen: false
   # ! -----------------------------------------------------
   # ! If you don't understand, please ignore the following.
   # ! -----------------------------------------------------
@@ -629,6 +631,7 @@ pjax:
   switches:
   switchesOptions:
   history: true
+  # If you enable this, you must set `scrollTo2screen: false` firstly.
   scrollTo: false
   scrollRestoration: false
   cacheBust: false

diff --git a/layout/_partials/config.pug b/layout/_partials/config.pug
@@ -53,6 +53,13 @@
     zoom_image = JSON.stringify(theme.zoom_image);
   }
 
+  var pjax_config = "undefined";
+  if (theme.pjax.enable) {
+    pjax_config = JSON.stringify({
+      scrollTo2screen: theme.pjax.scrollTo2screen
+    });
+  }
+
   var external_link = "undefined";
   if (theme.external_link.icon.enable) {
     external_link = JSON.stringify({
@@ -87,6 +94,7 @@ script.
     zoom_image: !{ zoom_image },
     gallery_waterfall: !{ gallery_waterfall },
     lazyload: !{ lazyload },
+    pjax: !{ pjax_config },
     external_link: !{ external_link },
     shortcuts: !{ shortcuts },
     prompt: !{ prompt }

diff --git a/layout/_third-party/pjax.pug b/layout/_third-party/pjax.pug
@@ -1,11 +1,7 @@
 -
   var pjaxArgs = {
-    'elements': [
-      'a:not([target=_blank])'
-    ],
     'selectors': [
       'head title',
-      'meta[name=description]',
       '#main',
       '.pjax-reload'
     ],
@@ -48,11 +44,13 @@ script.
     document.addEventListener('pjax:send', function () {
       $('.header-nav-menu').removeClass('show');
 
-      $('html').velocity('scroll', {
-        duration: 500,
-        offset: $('#header').height(),
-        easing: 'easeInOutCubic'
-      });
+      if (CONFIG.pjax.scrollTo2screen) {
+        $('html').velocity('scroll', {
+          duration: 500,
+          offset: $('#header').height(),
+          easing: 'easeInOutCubic'
+        });
+      }
 
       var loadingBarWidth = 0;
       var MAX_LOADING_WIDTH = 95;