From 84d8f358a81920c6c16efe21054d702deba7cd5b Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 29 Jul 2019 17:26:16 +0800
Subject: [PATCH 01/30] PJAX

---
 _config.yml                  |  10 ++
 layout/_layout.swig          |  36 +++-
 layout/_scripts/vendors.swig |   4 +
 source/js/algolia-search.js  |   2 +-
 source/js/exturl.js          |   2 +-
 source/js/local-search.js    |   2 +-
 source/js/motion.js          | 320 ++++++++++++++++++-----------------
 source/js/next-boot.js       |   6 +-
 source/js/schemes/muse.js    |   2 +-
 source/js/schemes/pisces.js  |   2 +-
 source/js/scroll-cookie.js   |   2 +-
 11 files changed, 220 insertions(+), 168 deletions(-)

diff --git a/_config.yml b/_config.yml
index 22d5a4ca66..402d165ceb 100644
--- a/_config.yml
+++ b/_config.yml
@@ -539,6 +539,10 @@ math:
       copy_tex_js: //cdn.jsdelivr.net/npm/katex@0/dist/contrib/copy-tex.min.js
       copy_tex_css: //cdn.jsdelivr.net/npm/katex@0/dist/contrib/copy-tex.min.css
 
+# Easily enable fast Ajax navigation on your website.
+# Dependencies: https://github.com/theme-next/theme-next-pjax
+pjax: false
+
 # Fancybox. There is support for old version 2 and new version 3.
 # Choose only one variant, do not need to install both.
 # To install 2.x: https://github.com/theme-next/theme-next-fancybox
@@ -1012,6 +1016,12 @@ vendors:
   # fontawesome: //cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css
   fontawesome:
 
+  # Internal version: 0.2.8
+  # See: https://github.com/MoOx/pjax
+  # Example:
+  # pjax: //cdn.jsdelivr.net/npm/pjax@2/pjax.min.js
+  pjax:
+
   # Internal version: 2.1.5 & 3.5.7
   # See: https://fancyapps.com/fancybox
   # Example:
diff --git a/layout/_layout.swig b/layout/_layout.swig
index 26e03e0044..8403eb164b 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -33,7 +33,7 @@
     {%- set container_class = container_class + ' sidebar-position-' + theme.sidebar.position %}
   {%- endif %}
 
-  <div class="{{ container_class }} {% block page_class %}{% endblock %}">
+  <div class="{{ container_class }}">
     <div class="headband"></div>
 
     <header id="header" class="header" itemscope itemtype="http://schema.org/WPHeader">
@@ -48,7 +48,7 @@
           {%- if theme.scheme === 'Pisces' || theme.scheme === 'Gemini' %}
             {% include '_partials/header/sub-menu.swig' %}
           {%- endif %}
-          <div id="content" class="content">
+          <div id="content" class="content {% block page_class %}{% endblock %}">
             {% block content %}{% endblock %}
           </div>
           {% include '_partials/comments.swig' %}
@@ -62,7 +62,13 @@
     <footer id="footer" class="footer">
       <div class="footer-inner">
         {{ partial('_partials/footer.swig', {}, {cache: theme.cache.enable}) }}
+        {%- if theme.pjax %}
+          <div id="reboot-analytics">
+        {%- endif %}
         {% include '_partials/analytics/index.swig' %}
+        {%- if theme.pjax %}
+          </div>
+        {%- endif %}
         {% block footer %}{% endblock %}
       </div>
     </footer>
@@ -92,11 +98,37 @@
   {% include '_scripts/exturl.swig' %}
   {% include '_scripts/three.swig' %}
 
+  {%- if theme.pjax %}
+    <div id="reboot-services">
+  {%- endif %}
   {% include '_third-party/index.swig' %}
 
   {%- for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
   {%- endfor %}
 
+  {%- if theme.pjax %}
+    </div>
+    <script>
+    var pjax = new Pjax({
+      selectors: [
+        'title',
+        'meta[name=description]',
+        '#main'
+      ]
+    });
+    $(document).on('pjax:success', function() {
+      $('#reboot-analytics script').remove().appendTo('#reboot-analytics');
+      $('#reboot-services script').remove().appendTo('#reboot-services');
+      $(document).trigger('ready');
+      // Define Motion Sequence & Bootstrap Motion.
+      CONFIG.motion.enable && NexT.motion.integrator
+        .init()
+        .add(NexT.motion.middleWares.postList)
+        .add(NexT.motion.middleWares.sidebar)
+        .bootstrap();
+    });
+    </script>
+  {%- endif %}
 </body>
 </html>
diff --git a/layout/_scripts/vendors.swig b/layout/_scripts/vendors.swig
index f87f04812c..896f0ca21c 100644
--- a/layout/_scripts/vendors.swig
+++ b/layout/_scripts/vendors.swig
@@ -2,6 +2,10 @@
 {%- set js_defer_vendors = {} %}
 {%- set js_vendors.jquery = 'jquery/index.js?v=3.4.1' %}
 
+{%- if theme.pjax %}
+  {%- set js_vendors.pjax = 'pjax/pjax.min.js?v=0.2.8' %}
+{%- endif %}
+
 {%- if theme.fancybox %}
   {%- set js_vendors.fancybox = 'fancybox/source/jquery.fancybox.pack.js' %}
 {%- endif %}
diff --git a/source/js/algolia-search.js b/source/js/algolia-search.js
index 6f7d5f1dfb..8d9161fa15 100644
--- a/source/js/algolia-search.js
+++ b/source/js/algolia-search.js
@@ -1,6 +1,6 @@
 /* global instantsearch, CONFIG */
 
-$(document).ready(function() {
+$(document).on('ready', function() {
   var algoliaSettings = CONFIG.algolia;
   var isAlgoliaSettingsValid = algoliaSettings.applicationID
                             && algoliaSettings.apiKey
diff --git a/source/js/exturl.js b/source/js/exturl.js
index 806a29efe5..c6852b65a6 100644
--- a/source/js/exturl.js
+++ b/source/js/exturl.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   // Create Base64 Object
   /* eslint-disable */
diff --git a/source/js/local-search.js b/source/js/local-search.js
index bd932b73ba..39c24eb105 100644
--- a/source/js/local-search.js
+++ b/source/js/local-search.js
@@ -2,7 +2,7 @@
 
 'use strict';
 
-$(document).ready(function() {
+$(document).on('ready', function() {
   // Popup Window
   var isfetched = false;
   var datas;
diff --git a/source/js/motion.js b/source/js/motion.js
index e6124f5acb..40bc44005d 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -1,185 +1,187 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
-  NexT.motion = {};
-
-  NexT.motion.integrator = {
-    queue : [],
-    cursor: -1,
-    add   : function(fn) {
-      this.queue.push(fn);
-      return this;
-    },
-    next: function() {
-      this.cursor++;
-      var fn = this.queue[this.cursor];
-      $.isFunction(fn) && fn(NexT.motion.integrator);
-    },
-    bootstrap: function() {
-      this.next();
+NexT.motion = {};
+
+NexT.motion.integrator = {
+  queue : [],
+  cursor: -1,
+  init  : function() {
+    this.queue = [];
+    this.cursor = -1;
+    return this;
+  },
+  add   : function(fn) {
+    this.queue.push(fn);
+    return this;
+  },
+  next: function() {
+    this.cursor++;
+    var fn = this.queue[this.cursor];
+    $.isFunction(fn) && fn(NexT.motion.integrator);
+  },
+  bootstrap: function() {
+    this.next();
+  }
+};
+
+NexT.motion.middleWares = {
+  logo: function(integrator) {
+    var sequence = [];
+    var $brand = $('.brand');
+    var $image = $('.custom-logo-image');
+    var $title = $('.site-title');
+    var $subtitle = $('.site-subtitle');
+    var $logoLineTop = $('.logo-line-before i');
+    var $logoLineBottom = $('.logo-line-after i');
+
+    $brand.length > 0 && sequence.push({
+      e: $brand,
+      p: {opacity: 1},
+      o: {duration: 200}
+    });
+
+    /**
+     * Check if $elements exist.
+     * @param {jQuery|Array} $elements
+     * @returns {boolean}
+     */
+    function hasElement($elements) {
+      $elements = Array.isArray($elements) ? $elements : [$elements];
+      return $elements.every(function($element) {
+        return $element.length > 0;
+      });
+    }
+
+    function getMistLineSettings(element, translateX) {
+      return {
+        e: $(element),
+        p: {translateX: translateX},
+        o: {
+          duration     : 500,
+          sequenceQueue: false
+        }
+      };
     }
-  };
-
-  NexT.motion.middleWares = {
-    logo: function(integrator) {
-      var sequence = [];
-      var $brand = $('.brand');
-      var $image = $('.custom-logo-image');
-      var $title = $('.site-title');
-      var $subtitle = $('.site-subtitle');
-      var $logoLineTop = $('.logo-line-before i');
-      var $logoLineBottom = $('.logo-line-after i');
-
-      $brand.length > 0 && sequence.push({
-        e: $brand,
-        p: {opacity: 1},
+
+    function pushImageToSequence() {
+      sequence.push({
+        e: $image,
+        p: {opacity: 1, top: 0},
         o: {duration: 200}
       });
+    }
 
-      /**
-       * Check if $elements exist.
-       * @param {jQuery|Array} $elements
-       * @returns {boolean}
-       */
-      function hasElement($elements) {
-        $elements = Array.isArray($elements) ? $elements : [$elements];
-        return $elements.every(function($element) {
-          return $element.length > 0;
-        });
-      }
+    NexT.utils.isMist() && hasElement([$logoLineTop, $logoLineBottom])
+    && sequence.push(
+      getMistLineSettings($logoLineTop, '100%'),
+      getMistLineSettings($logoLineBottom, '-100%')
+    );
 
-      function getMistLineSettings(element, translateX) {
-        return {
-          e: $(element),
-          p: {translateX: translateX},
-          o: {
-            duration     : 500,
-            sequenceQueue: false
-          }
-        };
-      }
+    NexT.utils.isMuse() && hasElement($image) && pushImageToSequence();
 
-      function pushImageToSequence() {
-        sequence.push({
-          e: $image,
-          p: {opacity: 1, top: 0},
-          o: {duration: 200}
-        });
-      }
+    hasElement($title) && sequence.push({
+      e: $title,
+      p: {opacity: 1, top: 0},
+      o: {duration: 200}
+    });
 
-      NexT.utils.isMist() && hasElement([$logoLineTop, $logoLineBottom])
-      && sequence.push(
-        getMistLineSettings($logoLineTop, '100%'),
-        getMistLineSettings($logoLineBottom, '-100%')
-      );
+    hasElement($subtitle) && sequence.push({
+      e: $subtitle,
+      p: {opacity: 1, top: 0},
+      o: {duration: 200}
+    });
 
-      NexT.utils.isMuse() && hasElement($image) && pushImageToSequence();
+    (NexT.utils.isPisces() || NexT.utils.isGemini()) && hasElement($image) && pushImageToSequence();
 
-      hasElement($title) && sequence.push({
-        e: $title,
-        p: {opacity: 1, top: 0},
-        o: {duration: 200}
-      });
-
-      hasElement($subtitle) && sequence.push({
-        e: $subtitle,
-        p: {opacity: 1, top: 0},
-        o: {duration: 200}
-      });
-
-      (NexT.utils.isPisces() || NexT.utils.isGemini()) && hasElement($image) && pushImageToSequence();
+    if (CONFIG.motion.async) {
+      integrator.next();
+    }
 
-      if (CONFIG.motion.async) {
+    if (sequence.length > 0) {
+      sequence[sequence.length - 1].o.complete = function() {
         integrator.next();
-      }
+      };
+      /* eslint-disable */
+      $.Velocity.RunSequence(sequence);
+      /* eslint-enable */
+    } else {
+      integrator.next();
+    }
+  },
 
-      if (sequence.length > 0) {
-        sequence[sequence.length - 1].o.complete = function() {
-          integrator.next();
-        };
-        /* eslint-disable */
-        $.Velocity.RunSequence(sequence);
-        /* eslint-enable */
-      } else {
-        integrator.next();
-      }
-    },
+  menu: function(integrator) {
 
-    menu: function(integrator) {
+    if (CONFIG.motion.async) {
+      integrator.next();
+    }
 
-      if (CONFIG.motion.async) {
+    $('.menu-item').velocity('transition.slideDownIn', {
+      display : null,
+      duration: 200,
+      complete: function() {
         integrator.next();
       }
-
-      $('.menu-item').velocity('transition.slideDownIn', {
-        display : null,
-        duration: 200,
-        complete: function() {
-          integrator.next();
-        }
-      });
-    },
-
-    postList: function(integrator) {
-
-      //var $post = $('.post');
-      var $postBlock = $('.post-block, .pagination, .comments');
-      var $postBlockTransition = CONFIG.motion.transition.post_block;
-      var $postHeader = $('.post-header');
-      var $postHeaderTransition = CONFIG.motion.transition.post_header;
-      var $postBody = $('.post-body');
-      var $postBodyTransition = CONFIG.motion.transition.post_body;
-      var $collHeader = $('.collection-title, .archive-year');
-      var $collHeaderTransition = CONFIG.motion.transition.coll_header;
-      var $sidebarAffix = $('.sidebar-inner');
-      var $sidebarAffixTransition = CONFIG.motion.transition.sidebar;
-      var hasPost = $postBlock.length > 0;
-
-      function postMotion() {
-        var postMotionOptions = window.postMotionOptions || {
-          stagger: 100,
-          drag   : true
-        };
-        postMotionOptions.complete = function() {
-          // After motion complete need to remove transform from sidebar to let affix work on Pisces | Gemini.
-          if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
-            $sidebarAffix.css({ 'transform': 'initial' });
-          }
-          integrator.next();
-        };
-
-        //$post.velocity('transition.slideDownIn', postMotionOptions);
-        if (CONFIG.motion.transition.post_block) {
-          $postBlock.velocity('transition.' + $postBlockTransition, postMotionOptions);
-        }
-        if (CONFIG.motion.transition.post_header) {
-          $postHeader.velocity('transition.' + $postHeaderTransition, postMotionOptions);
-        }
-        if (CONFIG.motion.transition.post_body) {
-          $postBody.velocity('transition.' + $postBodyTransition, postMotionOptions);
-        }
-        if (CONFIG.motion.transition.coll_header) {
-          $collHeader.velocity('transition.' + $collHeaderTransition, postMotionOptions);
-        }
-        // Only for Pisces | Gemini.
+    });
+  },
+
+  postList: function(integrator) {
+
+    //var $post = $('.post');
+    var $postBlock = $('.post-block, .pagination, .comments');
+    var $postBlockTransition = CONFIG.motion.transition.post_block;
+    var $postHeader = $('.post-header');
+    var $postHeaderTransition = CONFIG.motion.transition.post_header;
+    var $postBody = $('.post-body');
+    var $postBodyTransition = CONFIG.motion.transition.post_body;
+    var $collHeader = $('.collection-title, .archive-year');
+    var $collHeaderTransition = CONFIG.motion.transition.coll_header;
+    var $sidebarAffix = $('.sidebar-inner');
+    var $sidebarAffixTransition = CONFIG.motion.transition.sidebar;
+    var hasPost = $postBlock.length > 0;
+
+    function postMotion() {
+      var postMotionOptions = window.postMotionOptions || {
+        stagger: 100,
+        drag   : true
+      };
+      postMotionOptions.complete = function() {
+        // After motion complete need to remove transform from sidebar to let affix work on Pisces | Gemini.
         if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
-          $sidebarAffix.velocity('transition.' + $sidebarAffixTransition, postMotionOptions);
+          $sidebarAffix.css({ 'transform': 'initial' });
         }
-      }
-
-      hasPost ? postMotion() : integrator.next();
-
-      if (CONFIG.motion.async) {
         integrator.next();
-      }
-    },
+      };
 
-    sidebar: function(integrator) {
-      if (CONFIG.sidebar.display === 'always') {
-        NexT.utils.displaySidebar();
+      //$post.velocity('transition.slideDownIn', postMotionOptions);
+      if (CONFIG.motion.transition.post_block) {
+        $postBlock.velocity('transition.' + $postBlockTransition, postMotionOptions);
+      }
+      if (CONFIG.motion.transition.post_header) {
+        $postHeader.velocity('transition.' + $postHeaderTransition, postMotionOptions);
+      }
+      if (CONFIG.motion.transition.post_body) {
+        $postBody.velocity('transition.' + $postBodyTransition, postMotionOptions);
+      }
+      if (CONFIG.motion.transition.coll_header) {
+        $collHeader.velocity('transition.' + $collHeaderTransition, postMotionOptions);
       }
+      // Only for Pisces | Gemini.
+      if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
+        $sidebarAffix.velocity('transition.' + $sidebarAffixTransition, postMotionOptions);
+      }
+    }
+
+    hasPost ? postMotion() : integrator.next();
+
+    if (CONFIG.motion.async) {
       integrator.next();
     }
-  };
+  },
 
-});
+  sidebar: function(integrator) {
+    if (CONFIG.sidebar.display === 'always') {
+      NexT.utils.displaySidebar();
+    }
+    integrator.next();
+  }
+};
diff --git a/source/js/next-boot.js b/source/js/next-boot.js
index 793b6ff434..1415806615 100644
--- a/source/js/next-boot.js
+++ b/source/js/next-boot.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   /**
    * Register JS handlers by condition option.
@@ -70,6 +70,10 @@ $(document).ready(function() {
     $('table').not('.gist table').wrap('<div class="table-container"></div>');
   }
   wrapTable();
+});
+
+$(document).ready(function() {
+  $(document).trigger('ready');
 
   // Define Motion Sequence & Bootstrap Motion.
   CONFIG.motion.enable && NexT.motion.integrator
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index 52052b2c84..cba05c210c 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   var sidebarToggleLines = {
     lines: [],
diff --git a/source/js/schemes/pisces.js b/source/js/schemes/pisces.js
index 8c6e896fd3..d69a580ccf 100644
--- a/source/js/schemes/pisces.js
+++ b/source/js/schemes/pisces.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   var sidebarInner = $('.sidebar-inner');
   var sidebarOffset = CONFIG.sidebar.offset || 12;
diff --git a/source/js/scroll-cookie.js b/source/js/scroll-cookie.js
index 2db1f8af75..2d08c14254 100644
--- a/source/js/scroll-cookie.js
+++ b/source/js/scroll-cookie.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   /* global Cookies */
 

From b79654fa616fd0a99baf6e190caaec21bce27ba0 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 29 Jul 2019 17:26:16 +0800
Subject: [PATCH 02/30] PJAX

---
 _config.yml                  |  10 ++
 layout/_layout.swig          |  36 +++-
 layout/_scripts/vendors.swig |   4 +
 source/js/algolia-search.js  |   2 +-
 source/js/exturl.js          |   2 +-
 source/js/local-search.js    |   2 +-
 source/js/motion.js          | 320 ++++++++++++++++++-----------------
 source/js/next-boot.js       |   6 +-
 source/js/schemes/muse.js    |   2 +-
 source/js/schemes/pisces.js  |   2 +-
 source/js/scroll-cookie.js   |   2 +-
 11 files changed, 220 insertions(+), 168 deletions(-)

diff --git a/_config.yml b/_config.yml
index 22d5a4ca66..c61b98895d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -539,6 +539,11 @@ math:
       copy_tex_js: //cdn.jsdelivr.net/npm/katex@0/dist/contrib/copy-tex.min.js
       copy_tex_css: //cdn.jsdelivr.net/npm/katex@0/dist/contrib/copy-tex.min.css
 
+# Easily enable fast Ajax navigation on your website.
+# Dependencies: https://github.com/theme-next/theme-next-pjax
+# For moreinformation: https://github.com/MoOx/pjax
+pjax: false
+
 # Fancybox. There is support for old version 2 and new version 3.
 # Choose only one variant, do not need to install both.
 # To install 2.x: https://github.com/theme-next/theme-next-fancybox
@@ -1012,6 +1017,11 @@ vendors:
   # fontawesome: //cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css
   fontawesome:
 
+  # Internal version: 0.2.8
+  # Example:
+  # pjax: //cdn.jsdelivr.net/npm/pjax@2/pjax.min.js
+  pjax:
+
   # Internal version: 2.1.5 & 3.5.7
   # See: https://fancyapps.com/fancybox
   # Example:
diff --git a/layout/_layout.swig b/layout/_layout.swig
index 26e03e0044..8403eb164b 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -33,7 +33,7 @@
     {%- set container_class = container_class + ' sidebar-position-' + theme.sidebar.position %}
   {%- endif %}
 
-  <div class="{{ container_class }} {% block page_class %}{% endblock %}">
+  <div class="{{ container_class }}">
     <div class="headband"></div>
 
     <header id="header" class="header" itemscope itemtype="http://schema.org/WPHeader">
@@ -48,7 +48,7 @@
           {%- if theme.scheme === 'Pisces' || theme.scheme === 'Gemini' %}
             {% include '_partials/header/sub-menu.swig' %}
           {%- endif %}
-          <div id="content" class="content">
+          <div id="content" class="content {% block page_class %}{% endblock %}">
             {% block content %}{% endblock %}
           </div>
           {% include '_partials/comments.swig' %}
@@ -62,7 +62,13 @@
     <footer id="footer" class="footer">
       <div class="footer-inner">
         {{ partial('_partials/footer.swig', {}, {cache: theme.cache.enable}) }}
+        {%- if theme.pjax %}
+          <div id="reboot-analytics">
+        {%- endif %}
         {% include '_partials/analytics/index.swig' %}
+        {%- if theme.pjax %}
+          </div>
+        {%- endif %}
         {% block footer %}{% endblock %}
       </div>
     </footer>
@@ -92,11 +98,37 @@
   {% include '_scripts/exturl.swig' %}
   {% include '_scripts/three.swig' %}
 
+  {%- if theme.pjax %}
+    <div id="reboot-services">
+  {%- endif %}
   {% include '_third-party/index.swig' %}
 
   {%- for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
   {%- endfor %}
 
+  {%- if theme.pjax %}
+    </div>
+    <script>
+    var pjax = new Pjax({
+      selectors: [
+        'title',
+        'meta[name=description]',
+        '#main'
+      ]
+    });
+    $(document).on('pjax:success', function() {
+      $('#reboot-analytics script').remove().appendTo('#reboot-analytics');
+      $('#reboot-services script').remove().appendTo('#reboot-services');
+      $(document).trigger('ready');
+      // Define Motion Sequence & Bootstrap Motion.
+      CONFIG.motion.enable && NexT.motion.integrator
+        .init()
+        .add(NexT.motion.middleWares.postList)
+        .add(NexT.motion.middleWares.sidebar)
+        .bootstrap();
+    });
+    </script>
+  {%- endif %}
 </body>
 </html>
diff --git a/layout/_scripts/vendors.swig b/layout/_scripts/vendors.swig
index f87f04812c..896f0ca21c 100644
--- a/layout/_scripts/vendors.swig
+++ b/layout/_scripts/vendors.swig
@@ -2,6 +2,10 @@
 {%- set js_defer_vendors = {} %}
 {%- set js_vendors.jquery = 'jquery/index.js?v=3.4.1' %}
 
+{%- if theme.pjax %}
+  {%- set js_vendors.pjax = 'pjax/pjax.min.js?v=0.2.8' %}
+{%- endif %}
+
 {%- if theme.fancybox %}
   {%- set js_vendors.fancybox = 'fancybox/source/jquery.fancybox.pack.js' %}
 {%- endif %}
diff --git a/source/js/algolia-search.js b/source/js/algolia-search.js
index 6f7d5f1dfb..8d9161fa15 100644
--- a/source/js/algolia-search.js
+++ b/source/js/algolia-search.js
@@ -1,6 +1,6 @@
 /* global instantsearch, CONFIG */
 
-$(document).ready(function() {
+$(document).on('ready', function() {
   var algoliaSettings = CONFIG.algolia;
   var isAlgoliaSettingsValid = algoliaSettings.applicationID
                             && algoliaSettings.apiKey
diff --git a/source/js/exturl.js b/source/js/exturl.js
index 806a29efe5..c6852b65a6 100644
--- a/source/js/exturl.js
+++ b/source/js/exturl.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   // Create Base64 Object
   /* eslint-disable */
diff --git a/source/js/local-search.js b/source/js/local-search.js
index bd932b73ba..39c24eb105 100644
--- a/source/js/local-search.js
+++ b/source/js/local-search.js
@@ -2,7 +2,7 @@
 
 'use strict';
 
-$(document).ready(function() {
+$(document).on('ready', function() {
   // Popup Window
   var isfetched = false;
   var datas;
diff --git a/source/js/motion.js b/source/js/motion.js
index e6124f5acb..40bc44005d 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -1,185 +1,187 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
-  NexT.motion = {};
-
-  NexT.motion.integrator = {
-    queue : [],
-    cursor: -1,
-    add   : function(fn) {
-      this.queue.push(fn);
-      return this;
-    },
-    next: function() {
-      this.cursor++;
-      var fn = this.queue[this.cursor];
-      $.isFunction(fn) && fn(NexT.motion.integrator);
-    },
-    bootstrap: function() {
-      this.next();
+NexT.motion = {};
+
+NexT.motion.integrator = {
+  queue : [],
+  cursor: -1,
+  init  : function() {
+    this.queue = [];
+    this.cursor = -1;
+    return this;
+  },
+  add   : function(fn) {
+    this.queue.push(fn);
+    return this;
+  },
+  next: function() {
+    this.cursor++;
+    var fn = this.queue[this.cursor];
+    $.isFunction(fn) && fn(NexT.motion.integrator);
+  },
+  bootstrap: function() {
+    this.next();
+  }
+};
+
+NexT.motion.middleWares = {
+  logo: function(integrator) {
+    var sequence = [];
+    var $brand = $('.brand');
+    var $image = $('.custom-logo-image');
+    var $title = $('.site-title');
+    var $subtitle = $('.site-subtitle');
+    var $logoLineTop = $('.logo-line-before i');
+    var $logoLineBottom = $('.logo-line-after i');
+
+    $brand.length > 0 && sequence.push({
+      e: $brand,
+      p: {opacity: 1},
+      o: {duration: 200}
+    });
+
+    /**
+     * Check if $elements exist.
+     * @param {jQuery|Array} $elements
+     * @returns {boolean}
+     */
+    function hasElement($elements) {
+      $elements = Array.isArray($elements) ? $elements : [$elements];
+      return $elements.every(function($element) {
+        return $element.length > 0;
+      });
+    }
+
+    function getMistLineSettings(element, translateX) {
+      return {
+        e: $(element),
+        p: {translateX: translateX},
+        o: {
+          duration     : 500,
+          sequenceQueue: false
+        }
+      };
     }
-  };
-
-  NexT.motion.middleWares = {
-    logo: function(integrator) {
-      var sequence = [];
-      var $brand = $('.brand');
-      var $image = $('.custom-logo-image');
-      var $title = $('.site-title');
-      var $subtitle = $('.site-subtitle');
-      var $logoLineTop = $('.logo-line-before i');
-      var $logoLineBottom = $('.logo-line-after i');
-
-      $brand.length > 0 && sequence.push({
-        e: $brand,
-        p: {opacity: 1},
+
+    function pushImageToSequence() {
+      sequence.push({
+        e: $image,
+        p: {opacity: 1, top: 0},
         o: {duration: 200}
       });
+    }
 
-      /**
-       * Check if $elements exist.
-       * @param {jQuery|Array} $elements
-       * @returns {boolean}
-       */
-      function hasElement($elements) {
-        $elements = Array.isArray($elements) ? $elements : [$elements];
-        return $elements.every(function($element) {
-          return $element.length > 0;
-        });
-      }
+    NexT.utils.isMist() && hasElement([$logoLineTop, $logoLineBottom])
+    && sequence.push(
+      getMistLineSettings($logoLineTop, '100%'),
+      getMistLineSettings($logoLineBottom, '-100%')
+    );
 
-      function getMistLineSettings(element, translateX) {
-        return {
-          e: $(element),
-          p: {translateX: translateX},
-          o: {
-            duration     : 500,
-            sequenceQueue: false
-          }
-        };
-      }
+    NexT.utils.isMuse() && hasElement($image) && pushImageToSequence();
 
-      function pushImageToSequence() {
-        sequence.push({
-          e: $image,
-          p: {opacity: 1, top: 0},
-          o: {duration: 200}
-        });
-      }
+    hasElement($title) && sequence.push({
+      e: $title,
+      p: {opacity: 1, top: 0},
+      o: {duration: 200}
+    });
 
-      NexT.utils.isMist() && hasElement([$logoLineTop, $logoLineBottom])
-      && sequence.push(
-        getMistLineSettings($logoLineTop, '100%'),
-        getMistLineSettings($logoLineBottom, '-100%')
-      );
+    hasElement($subtitle) && sequence.push({
+      e: $subtitle,
+      p: {opacity: 1, top: 0},
+      o: {duration: 200}
+    });
 
-      NexT.utils.isMuse() && hasElement($image) && pushImageToSequence();
+    (NexT.utils.isPisces() || NexT.utils.isGemini()) && hasElement($image) && pushImageToSequence();
 
-      hasElement($title) && sequence.push({
-        e: $title,
-        p: {opacity: 1, top: 0},
-        o: {duration: 200}
-      });
-
-      hasElement($subtitle) && sequence.push({
-        e: $subtitle,
-        p: {opacity: 1, top: 0},
-        o: {duration: 200}
-      });
-
-      (NexT.utils.isPisces() || NexT.utils.isGemini()) && hasElement($image) && pushImageToSequence();
+    if (CONFIG.motion.async) {
+      integrator.next();
+    }
 
-      if (CONFIG.motion.async) {
+    if (sequence.length > 0) {
+      sequence[sequence.length - 1].o.complete = function() {
         integrator.next();
-      }
+      };
+      /* eslint-disable */
+      $.Velocity.RunSequence(sequence);
+      /* eslint-enable */
+    } else {
+      integrator.next();
+    }
+  },
 
-      if (sequence.length > 0) {
-        sequence[sequence.length - 1].o.complete = function() {
-          integrator.next();
-        };
-        /* eslint-disable */
-        $.Velocity.RunSequence(sequence);
-        /* eslint-enable */
-      } else {
-        integrator.next();
-      }
-    },
+  menu: function(integrator) {
 
-    menu: function(integrator) {
+    if (CONFIG.motion.async) {
+      integrator.next();
+    }
 
-      if (CONFIG.motion.async) {
+    $('.menu-item').velocity('transition.slideDownIn', {
+      display : null,
+      duration: 200,
+      complete: function() {
         integrator.next();
       }
-
-      $('.menu-item').velocity('transition.slideDownIn', {
-        display : null,
-        duration: 200,
-        complete: function() {
-          integrator.next();
-        }
-      });
-    },
-
-    postList: function(integrator) {
-
-      //var $post = $('.post');
-      var $postBlock = $('.post-block, .pagination, .comments');
-      var $postBlockTransition = CONFIG.motion.transition.post_block;
-      var $postHeader = $('.post-header');
-      var $postHeaderTransition = CONFIG.motion.transition.post_header;
-      var $postBody = $('.post-body');
-      var $postBodyTransition = CONFIG.motion.transition.post_body;
-      var $collHeader = $('.collection-title, .archive-year');
-      var $collHeaderTransition = CONFIG.motion.transition.coll_header;
-      var $sidebarAffix = $('.sidebar-inner');
-      var $sidebarAffixTransition = CONFIG.motion.transition.sidebar;
-      var hasPost = $postBlock.length > 0;
-
-      function postMotion() {
-        var postMotionOptions = window.postMotionOptions || {
-          stagger: 100,
-          drag   : true
-        };
-        postMotionOptions.complete = function() {
-          // After motion complete need to remove transform from sidebar to let affix work on Pisces | Gemini.
-          if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
-            $sidebarAffix.css({ 'transform': 'initial' });
-          }
-          integrator.next();
-        };
-
-        //$post.velocity('transition.slideDownIn', postMotionOptions);
-        if (CONFIG.motion.transition.post_block) {
-          $postBlock.velocity('transition.' + $postBlockTransition, postMotionOptions);
-        }
-        if (CONFIG.motion.transition.post_header) {
-          $postHeader.velocity('transition.' + $postHeaderTransition, postMotionOptions);
-        }
-        if (CONFIG.motion.transition.post_body) {
-          $postBody.velocity('transition.' + $postBodyTransition, postMotionOptions);
-        }
-        if (CONFIG.motion.transition.coll_header) {
-          $collHeader.velocity('transition.' + $collHeaderTransition, postMotionOptions);
-        }
-        // Only for Pisces | Gemini.
+    });
+  },
+
+  postList: function(integrator) {
+
+    //var $post = $('.post');
+    var $postBlock = $('.post-block, .pagination, .comments');
+    var $postBlockTransition = CONFIG.motion.transition.post_block;
+    var $postHeader = $('.post-header');
+    var $postHeaderTransition = CONFIG.motion.transition.post_header;
+    var $postBody = $('.post-body');
+    var $postBodyTransition = CONFIG.motion.transition.post_body;
+    var $collHeader = $('.collection-title, .archive-year');
+    var $collHeaderTransition = CONFIG.motion.transition.coll_header;
+    var $sidebarAffix = $('.sidebar-inner');
+    var $sidebarAffixTransition = CONFIG.motion.transition.sidebar;
+    var hasPost = $postBlock.length > 0;
+
+    function postMotion() {
+      var postMotionOptions = window.postMotionOptions || {
+        stagger: 100,
+        drag   : true
+      };
+      postMotionOptions.complete = function() {
+        // After motion complete need to remove transform from sidebar to let affix work on Pisces | Gemini.
         if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
-          $sidebarAffix.velocity('transition.' + $sidebarAffixTransition, postMotionOptions);
+          $sidebarAffix.css({ 'transform': 'initial' });
         }
-      }
-
-      hasPost ? postMotion() : integrator.next();
-
-      if (CONFIG.motion.async) {
         integrator.next();
-      }
-    },
+      };
 
-    sidebar: function(integrator) {
-      if (CONFIG.sidebar.display === 'always') {
-        NexT.utils.displaySidebar();
+      //$post.velocity('transition.slideDownIn', postMotionOptions);
+      if (CONFIG.motion.transition.post_block) {
+        $postBlock.velocity('transition.' + $postBlockTransition, postMotionOptions);
+      }
+      if (CONFIG.motion.transition.post_header) {
+        $postHeader.velocity('transition.' + $postHeaderTransition, postMotionOptions);
+      }
+      if (CONFIG.motion.transition.post_body) {
+        $postBody.velocity('transition.' + $postBodyTransition, postMotionOptions);
+      }
+      if (CONFIG.motion.transition.coll_header) {
+        $collHeader.velocity('transition.' + $collHeaderTransition, postMotionOptions);
       }
+      // Only for Pisces | Gemini.
+      if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
+        $sidebarAffix.velocity('transition.' + $sidebarAffixTransition, postMotionOptions);
+      }
+    }
+
+    hasPost ? postMotion() : integrator.next();
+
+    if (CONFIG.motion.async) {
       integrator.next();
     }
-  };
+  },
 
-});
+  sidebar: function(integrator) {
+    if (CONFIG.sidebar.display === 'always') {
+      NexT.utils.displaySidebar();
+    }
+    integrator.next();
+  }
+};
diff --git a/source/js/next-boot.js b/source/js/next-boot.js
index 793b6ff434..1415806615 100644
--- a/source/js/next-boot.js
+++ b/source/js/next-boot.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   /**
    * Register JS handlers by condition option.
@@ -70,6 +70,10 @@ $(document).ready(function() {
     $('table').not('.gist table').wrap('<div class="table-container"></div>');
   }
   wrapTable();
+});
+
+$(document).ready(function() {
+  $(document).trigger('ready');
 
   // Define Motion Sequence & Bootstrap Motion.
   CONFIG.motion.enable && NexT.motion.integrator
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index 52052b2c84..cba05c210c 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   var sidebarToggleLines = {
     lines: [],
diff --git a/source/js/schemes/pisces.js b/source/js/schemes/pisces.js
index 8c6e896fd3..d69a580ccf 100644
--- a/source/js/schemes/pisces.js
+++ b/source/js/schemes/pisces.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   var sidebarInner = $('.sidebar-inner');
   var sidebarOffset = CONFIG.sidebar.offset || 12;
diff --git a/source/js/scroll-cookie.js b/source/js/scroll-cookie.js
index 2db1f8af75..2d08c14254 100644
--- a/source/js/scroll-cookie.js
+++ b/source/js/scroll-cookie.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+$(document).on('ready', function() {
 
   /* global Cookies */
 

From ae078c924ec54c758b1f129e92e8e9fb33617d95 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Wed, 31 Jul 2019 13:21:49 +0800
Subject: [PATCH 03/30] Update

---
 layout/_layout.swig               | 23 ++++++--------
 layout/_macro/menu/menu-item.swig |  2 +-
 scripts/helpers/engine.js         | 13 --------
 source/js/algolia-search.js       |  4 +--
 source/js/exturl.js               | 11 ++++---
 source/js/local-search.js         | 18 +++++------
 source/js/next-boot.js            | 51 ++++++++++++++++---------------
 source/js/post-details.js         |  4 +--
 source/js/schemes/muse.js         |  2 +-
 source/js/schemes/pisces.js       |  2 +-
 source/js/scroll-cookie.js        |  3 +-
 source/js/utils.js                | 15 +++++++--
 12 files changed, 71 insertions(+), 77 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 8403eb164b..cec8823071 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -62,13 +62,9 @@
     <footer id="footer" class="footer">
       <div class="footer-inner">
         {{ partial('_partials/footer.swig', {}, {cache: theme.cache.enable}) }}
-        {%- if theme.pjax %}
-          <div id="reboot-analytics">
-        {%- endif %}
-        {% include '_partials/analytics/index.swig' %}
-        {%- if theme.pjax %}
-          </div>
-        {%- endif %}
+        <div class="reboot">
+          {% include '_partials/analytics/index.swig' %}
+        </div>
         {% block footer %}{% endblock %}
       </div>
     </footer>
@@ -98,17 +94,15 @@
   {% include '_scripts/exturl.swig' %}
   {% include '_scripts/three.swig' %}
 
-  {%- if theme.pjax %}
-    <div id="reboot-services">
-  {%- endif %}
+  <div class="reboot">
   {% include '_third-party/index.swig' %}
 
   {%- for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
   {%- endfor %}
+  </div>
 
   {%- if theme.pjax %}
-    </div>
     <script>
     var pjax = new Pjax({
       selectors: [
@@ -118,9 +112,10 @@
       ]
     });
     $(document).on('pjax:success', function() {
-      $('#reboot-analytics script').remove().appendTo('#reboot-analytics');
-      $('#reboot-services script').remove().appendTo('#reboot-services');
-      $(document).trigger('ready');
+      $('.menu-item').css("opacity", 1);
+      $('.reboot').each(function() {
+        $(this).find('script').remove().appendTo($(this));
+      });
       // Define Motion Sequence & Bootstrap Motion.
       CONFIG.motion.enable && NexT.motion.integrator
         .init()
diff --git a/layout/_macro/menu/menu-item.swig b/layout/_macro/menu/menu-item.swig
index 734f1f5efe..d0ab3ac90a 100644
--- a/layout/_macro/menu/menu-item.swig
+++ b/layout/_macro/menu/menu-item.swig
@@ -5,7 +5,7 @@
   {%- if itemURL.indexOf('http') != 0 %}
     {%- set itemURL = itemURL | replace('//', '/', 'g') %}
   {%- endif %}
-  <li class="menu-item menu-item-{{ itemName | replace(' ', '-', 'g') }}{{ item_active(itemURL, 'menu-item-active') }}">
+  <li class="menu-item menu-item-{{ itemName | replace(' ', '-', 'g') }}">
 
     {%- set menuText = __('menu.' + name) | replace('menu.', '') %}
     {%- if theme.menu_settings.icons %}
diff --git a/scripts/helpers/engine.js b/scripts/helpers/engine.js
index c61dae868b..d17d9bc248 100644
--- a/scripts/helpers/engine.js
+++ b/scripts/helpers/engine.js
@@ -11,16 +11,3 @@ hexo.extend.helper.register('next_env', function(type) {
   var env = require(path.normalize('../../package.json'));
   return env[type];
 });
-
-hexo.extend.helper.register('item_active', function(path, className) {
-  var canonical = this.page.canonical_path;
-  var current = this.url_for(canonical).replace('index.html', '', 'g');
-  var result = '';
-
-  if (current.indexOf(path) !== -1) {
-    if (path !== '/' || path === current) {
-      result = ' ' + className;
-    }
-  }
-  return result;
-});
diff --git a/source/js/algolia-search.js b/source/js/algolia-search.js
index 8d9161fa15..c4422dda5f 100644
--- a/source/js/algolia-search.js
+++ b/source/js/algolia-search.js
@@ -1,6 +1,6 @@
 /* global instantsearch, CONFIG */
 
-$(document).on('ready', function() {
+$(document).on('DOMContentLoaded', function() {
   var algoliaSettings = CONFIG.algolia;
   var isAlgoliaSettingsValid = algoliaSettings.applicationID
                             && algoliaSettings.apiKey
@@ -91,7 +91,7 @@ $(document).on('ready', function() {
   $('.popup-trigger').on('click', function(e) {
     e.stopPropagation();
     $('body')
-      .append('<div class="search-popup-overlay algolia-pop-overlay"></div>')
+      .append('<div class="algolia-pop-overlay"></div>')
       .css('overflow', 'hidden');
     $('.popup').toggle();
     $('#algolia-search-input').find('input').focus();
diff --git a/source/js/exturl.js b/source/js/exturl.js
index 0ae4ab6000..135f11b022 100644
--- a/source/js/exturl.js
+++ b/source/js/exturl.js
@@ -1,14 +1,15 @@
-$(document).on('ready', function() {
-
+$(document).on('DOMContentLoaded', function() {
   // Create Base64 Object
   /* jshint ignore:start*/
-  var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9+/=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/rn/g,"n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}};
+  window.Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9+/=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/rn/g,"n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}};
   /* jshint ignore:end */
+});
+
+$(document).on('DOMContentLoaded pjax:success', function() {
   $('.exturl').on('click', function() {
     var $exturl = $(this).attr('data-url');
     var $decurl = Base64.decode($exturl);
-    window.open($decurl, '_blank');
+    window.open($decurl, '_blank', 'noopener');
     return false;
   });
-
 });
diff --git a/source/js/local-search.js b/source/js/local-search.js
index c67057d922..bfd210f60b 100644
--- a/source/js/local-search.js
+++ b/source/js/local-search.js
@@ -1,6 +1,6 @@
 /* global CONFIG */
 
-$(document).on('ready', function() {
+$(document).on('DOMContentLoaded', function() {
   // Popup Window
   var isfetched = false;
   var datas;
@@ -273,21 +273,21 @@ $(document).on('ready', function() {
 
   function proceedSearch() {
     $('body')
-      .append('<div class="search-popup-overlay local-search-pop-overlay"></div>')
+      .append('<div class="local-search-pop-overlay"></div>')
       .css('overflow', 'hidden');
-    $('.search-popup-overlay').click(onPopupClose);
-    $('.popup').toggle();
-    var $localSearchInput = $('#local-search-input');
-    $localSearchInput.attr('autocapitalize', 'none');
-    $localSearchInput.attr('autocorrect', 'off');
-    $localSearchInput.focus();
+    $('.local-search-pop-overlay').click(onPopupClose);
+    $('.popup').show();
+    $('#local-search-input')
+      .attr('autocapitalize', 'none')
+      .attr('autocorrect', 'off')
+      .focus();
   }
 
   // Search function
   function searchFunc() {
     // Start loading animation
     $('body')
-      .append(`<div class="search-popup-overlay local-search-pop-overlay">
+      .append(`<div class="local-search-pop-overlay">
           <div id="search-loading-icon">
             <i class="fa fa-spinner fa-pulse fa-5x fa-fw"></i>
           </div>
diff --git a/source/js/next-boot.js b/source/js/next-boot.js
index 1415806615..e5c850ae11 100644
--- a/source/js/next-boot.js
+++ b/source/js/next-boot.js
@@ -1,21 +1,9 @@
 /* global NexT, CONFIG */
 
-$(document).on('ready', function() {
+$(document).on('DOMContentLoaded', function() {
 
-  /**
-   * Register JS handlers by condition option.
-   * Need to add config option in Front-End at 'layout/_partials/head.swig' file.
-   */
-  CONFIG.fancybox && NexT.utils.wrapImageWithFancyBox();
-  CONFIG.mediumzoom && window.mediumZoom('.post-body img');
-  CONFIG.lazyload && window.lozad('.post-body img').observe();
-  CONFIG.pangu && window.pangu.spacingPage();
-
-  CONFIG.copycode.enable && NexT.utils.registerCopyCode();
   CONFIG.back2top.enable && NexT.utils.registerBackToTop();
-  CONFIG.tabs && NexT.utils.registerTabsTag();
   NexT.utils.registerCanIUseTag();
-  NexT.utils.embeddedVideoTransformer();
 
   // Mobile top menu bar.
   $('.site-nav-toggle button').on('click', function() {
@@ -30,6 +18,31 @@ $(document).on('ready', function() {
     });
   });
 
+  // Define Motion Sequence & Bootstrap Motion.
+  CONFIG.motion.enable && NexT.motion.integrator
+    .add(NexT.motion.middleWares.logo)
+    .add(NexT.motion.middleWares.menu)
+    .add(NexT.motion.middleWares.postList)
+    .add(NexT.motion.middleWares.sidebar)
+    .bootstrap();
+});
+
+$(document).on('DOMContentLoaded pjax:success', function() {
+
+  /**
+   * Register JS handlers by condition option.
+   * Need to add config option in Front-End at 'layout/_partials/head.swig' file.
+   */
+  CONFIG.fancybox && NexT.utils.wrapImageWithFancyBox();
+  CONFIG.mediumzoom && window.mediumZoom('.post-body img');
+  CONFIG.lazyload && window.lozad('.post-body img').observe();
+  CONFIG.pangu && window.pangu.spacingPage();
+
+  CONFIG.copycode.enable && NexT.utils.registerCopyCode();
+  CONFIG.tabs && NexT.utils.registerTabsTag();
+  NexT.utils.registerActiveMenuItem();
+  NexT.utils.embeddedVideoTransformer();
+
   /**
    * Init Sidebar & TOC inner dimensions on all pages and for all schemes.
    * Need for Sidebar/TOC inner scrolling if content taller then viewport.
@@ -71,15 +84,3 @@ $(document).on('ready', function() {
   }
   wrapTable();
 });
-
-$(document).ready(function() {
-  $(document).trigger('ready');
-
-  // Define Motion Sequence & Bootstrap Motion.
-  CONFIG.motion.enable && NexT.motion.integrator
-    .add(NexT.motion.middleWares.logo)
-    .add(NexT.motion.middleWares.menu)
-    .add(NexT.motion.middleWares.postList)
-    .add(NexT.motion.middleWares.sidebar)
-    .bootstrap();
-});
diff --git a/source/js/post-details.js b/source/js/post-details.js
index ba869801af..b7771805b1 100644
--- a/source/js/post-details.js
+++ b/source/js/post-details.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).ready(function() {
+$(document).on('DOMContentLoaded', function() {
 
   function initScrollSpy() {
     var tocSelector = '.post-toc';
@@ -30,7 +30,7 @@ $(document).ready(function() {
   initScrollSpy();
 });
 
-$(document).ready(function() {
+$(document).on('DOMContentLoaded pjax:success', function() {
   var TAB_ANIMATE_DURATION = 200;
 
   $('.sidebar-nav li').on('click', function() {
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index cba05c210c..4541d89a1d 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).on('ready', function() {
+$(document).on('DOMContentLoaded pjax:success', function() {
 
   var sidebarToggleLines = {
     lines: [],
diff --git a/source/js/schemes/pisces.js b/source/js/schemes/pisces.js
index d69a580ccf..6624b86e57 100644
--- a/source/js/schemes/pisces.js
+++ b/source/js/schemes/pisces.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).on('ready', function() {
+$(document).on('DOMContentLoaded pjax:success', function() {
 
   var sidebarInner = $('.sidebar-inner');
   var sidebarOffset = CONFIG.sidebar.offset || 12;
diff --git a/source/js/scroll-cookie.js b/source/js/scroll-cookie.js
index 2d08c14254..5dbdc7bf1b 100644
--- a/source/js/scroll-cookie.js
+++ b/source/js/scroll-cookie.js
@@ -1,4 +1,4 @@
-$(document).on('ready', function() {
+$(document).on('DOMContentLoaded', function() {
 
   /* global Cookies */
 
@@ -21,5 +21,4 @@ $(document).on('ready', function() {
       $(window).scrollTop(cvalues[0]);
     }
   }
-
 });
diff --git a/source/js/utils.js b/source/js/utils.js
index 2a79e989ff..cd1ae8bf09 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -131,7 +131,7 @@ NexT.utils = {
     var tNav = '.tabs ul.nav-tabs ';
 
     // Binding `nav-tabs` & `tab-content` by real time permalink changing.
-    $(function() {
+    $(document).on('DOMContentLoaded pjax:success', function() {
       $(window).bind('hashchange', function() {
         var tHash = location.hash;
         if (tHash !== '' && !tHash.match(/%\S{2}/)) {
@@ -171,6 +171,18 @@ NexT.utils = {
     }, false);
   },
 
+  registerActiveMenuItem: function() {
+    $('.menu-item').each(function() {
+      var target = $(this).find('a[href]')[0];
+      if (target.hostname === location.hostname && (target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', '', 'g'))) {
+        $(this).addClass('menu-item-active');
+      }
+      else {
+        $(this).removeClass('menu-item-active');
+      }
+    });
+  },
+
   /**
    * Transform embedded video to support responsive layout.
    * @see http://toddmotto.com/fluid-and-responsive-youtube-and-vimeo-videos-with-fluidvids-js/
@@ -248,7 +260,6 @@ NexT.utils = {
         }
       }
     });
-
   },
 
   hasMobileUA: function() {

From 1f2c0210822577cf0e062dd2153c90ad3148a21d Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Wed, 31 Jul 2019 14:17:10 +0800
Subject: [PATCH 04/30] Fix QA

---
 source/js/exturl.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/js/exturl.js b/source/js/exturl.js
index 135f11b022..2f4f32f005 100644
--- a/source/js/exturl.js
+++ b/source/js/exturl.js
@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 $(document).on('DOMContentLoaded', function() {
   // Create Base64 Object
   /* jshint ignore:start*/

From cd4ee3e7146b1f60813cc4d50134d4154315d829 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Wed, 31 Jul 2019 14:53:28 +0800
Subject: [PATCH 05/30] Fix QA

---
 source/js/utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/js/utils.js b/source/js/utils.js
index cd1ae8bf09..ea54cec849 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -176,8 +176,7 @@ NexT.utils = {
       var target = $(this).find('a[href]')[0];
       if (target.hostname === location.hostname && (target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', '', 'g'))) {
         $(this).addClass('menu-item-active');
-      }
-      else {
+      } else {
         $(this).removeClass('menu-item-active');
       }
     });

From 33052176643436cc3f1e81932767aa1d627e8fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=8D=C9=AA=E1=B4=8D=C9=AA?= <1119186082@qq.com>
Date: Thu, 1 Aug 2019 17:17:22 +0800
Subject: [PATCH 06/30] Update _config.yml

---
 _config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.yml b/_config.yml
index 687c7eb258..53789c9172 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1028,7 +1028,7 @@ vendors:
 
   # Internal version: 0.2.8
   # Example:
-  # pjax: //cdn.jsdelivr.net/npm/pjax@2/pjax.min.js
+  # pjax: //cdn.jsdelivr.net/npm/pjax@0/pjax.min.js
   pjax:
 
   # Internal version: 2.1.5 & 3.5.7

From 323b40c550f167dae42c16400c5e151168223fcd Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 00:24:56 +0800
Subject: [PATCH 07/30] script[reboot]

---
 _config.yml                                   |  1 -
 layout/_layout.swig                           | 10 ++--
 .../_partials/analytics/busuanzi-counter.swig |  2 +-
 .../_partials/analytics/cnzz-analytics.swig   |  2 +-
 .../analytics/tencent-analytics.swig          |  2 +-
 layout/_partials/analytics/tencent-mta.swig   |  2 +-
 .../analytics/application-insights.swig       |  2 +-
 .../analytics/baidu-analytics.swig            |  2 +-
 layout/_third-party/analytics/firestore.swig  |  2 +-
 .../analytics/google-analytics.swig           |  2 +-
 layout/_third-party/analytics/growingio.swig  |  2 +-
 .../analytics/lean-analytics.swig             |  2 +-
 layout/_third-party/baidu-push.swig           |  2 +-
 layout/_third-party/bookmark.swig             |  2 +-
 layout/_third-party/comments/disqus.swig      |  4 +-
 layout/_third-party/comments/disqusjs.swig    |  2 +-
 layout/_third-party/comments/gitalk.swig      |  2 +-
 layout/_third-party/comments/livere.swig      |  2 +-
 layout/_third-party/comments/valine.swig      |  4 +-
 layout/_third-party/facebook-sdk.swig         |  2 +-
 layout/_third-party/index.swig                |  1 -
 layout/_third-party/math/katex.swig           |  2 +-
 layout/_third-party/math/mathjax.swig         |  2 +-
 layout/_third-party/quicklink.swig            |  2 +-
 layout/_third-party/rating.swig               |  2 +-
 layout/_third-party/schedule.swig             |  4 --
 layout/_third-party/tags/mermaid.swig         | 37 ++++++++------
 layout/_third-party/tags/pdf.swig             | 49 ++++++++++---------
 layout/_third-party/vkontakte-api.swig        |  2 +-
 layout/schedule.swig                          |  1 +
 30 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/_config.yml b/_config.yml
index 53789c9172..1eca549b14 100644
--- a/_config.yml
+++ b/_config.yml
@@ -387,7 +387,6 @@ tagcloud:
 # To get api_key: https://console.developers.google.com
 # Create & manage a public Google calendar: https://support.google.com/calendar/answer/37083
 calendar:
-  enable: false
   calendar_id: <required> # Your Google account E-Mail
   api_key: <required>
   orderBy: startTime
diff --git a/layout/_layout.swig b/layout/_layout.swig
index cec8823071..e7f2c7dee2 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -62,9 +62,7 @@
     <footer id="footer" class="footer">
       <div class="footer-inner">
         {{ partial('_partials/footer.swig', {}, {cache: theme.cache.enable}) }}
-        <div class="reboot">
-          {% include '_partials/analytics/index.swig' %}
-        </div>
+        {% include '_partials/analytics/index.swig' %}
         {% block footer %}{% endblock %}
       </div>
     </footer>
@@ -94,13 +92,11 @@
   {% include '_scripts/exturl.swig' %}
   {% include '_scripts/three.swig' %}
 
-  <div class="reboot">
   {% include '_third-party/index.swig' %}
 
   {%- for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
   {%- endfor %}
-  </div>
 
   {%- if theme.pjax %}
     <script>
@@ -113,8 +109,8 @@
     });
     $(document).on('pjax:success', function() {
       $('.menu-item').css("opacity", 1);
-      $('.reboot').each(function() {
-        $(this).find('script').remove().appendTo($(this));
+      $('script[reboot]').each(function(i, o) {
+        $(o).parent().append($(o).remove());
       });
       // Define Motion Sequence & Bootstrap Motion.
       CONFIG.motion.enable && NexT.motion.integrator
diff --git a/layout/_partials/analytics/busuanzi-counter.swig b/layout/_partials/analytics/busuanzi-counter.swig
index 1cedae261a..1e3261dc85 100644
--- a/layout/_partials/analytics/busuanzi-counter.swig
+++ b/layout/_partials/analytics/busuanzi-counter.swig
@@ -1,6 +1,6 @@
 {%- if theme.busuanzi_count.enable %}
 <div class="busuanzi-count">
-  <script async src="https://busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
+  <script reboot async src="https://busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
 
   {%- if theme.busuanzi_count.total_visitors %}
     <span class="post-meta-item-icon">
diff --git a/layout/_partials/analytics/cnzz-analytics.swig b/layout/_partials/analytics/cnzz-analytics.swig
index 7aae102a9c..29b88147a6 100644
--- a/layout/_partials/analytics/cnzz-analytics.swig
+++ b/layout/_partials/analytics/cnzz-analytics.swig
@@ -1,5 +1,5 @@
 {%- if theme.cnzz_siteid %}
   <div style="display: none;">
-    <script src="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
+    <script  rebootsrc="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
   </div>
 {%- endif %}
diff --git a/layout/_partials/analytics/tencent-analytics.swig b/layout/_partials/analytics/tencent-analytics.swig
index 194351f349..c82436c903 100644
--- a/layout/_partials/analytics/tencent-analytics.swig
+++ b/layout/_partials/analytics/tencent-analytics.swig
@@ -1,5 +1,5 @@
 {%- if theme.tencent_analytics %}
-  <script>
+  <script reboot>
     (function() {
       var hm = document.createElement("script");
       hm.src = "//tajs.qq.com/stats?sId={{ theme.tencent_analytics }}";
diff --git a/layout/_partials/analytics/tencent-mta.swig b/layout/_partials/analytics/tencent-mta.swig
index d7044c8896..08f8494558 100644
--- a/layout/_partials/analytics/tencent-mta.swig
+++ b/layout/_partials/analytics/tencent-mta.swig
@@ -1,5 +1,5 @@
 {%- if theme.tencent_mta %}
-  <script>
+  <script reboot>
     var _mtac = {};
     (function() {
       var mta = document.createElement("script");
diff --git a/layout/_third-party/analytics/application-insights.swig b/layout/_third-party/analytics/application-insights.swig
index 6cd9c718e7..5bf8de9ab9 100644
--- a/layout/_third-party/analytics/application-insights.swig
+++ b/layout/_third-party/analytics/application-insights.swig
@@ -1,5 +1,5 @@
 {%- if theme.application_insights %}
-  <script>
+  <script reboot>
     var appInsights=window.appInsights||function(config){
       function i(config){t[config]=function(){var i=arguments;t.queue.push(function(){t[config].apply(t,i)})}}var t={config:config},u=document,e=window,o="script",s="AuthenticatedUserContext",h="start",c="stop",l="Track",a=l+"Event",v=l+"Page",y=u.createElement(o),r,f;y.src=config.url||"https://az416426.vo.msecnd.net/scripts/a/ai.0.js";u.getElementsByTagName(o)[0].parentNode.appendChild(y);try{t.cookie=u.cookie}catch(p){}for(t.queue=[],t.version="1.0",r=["Event","Exception","Metric","PageView","Trace","Dependency"];r.length;)i("track"+r.pop());return i("set"+s),i("clear"+s),i(h+a),i(c+a),i(h+v),i(c+v),i("flush"),config.disableExceptionTracking||(r="onerror",i("_"+r),f=e[r],e[r]=function(config,i,u,e,o){var s=f&&f(config,i,u,e,o);return s!==!0&&t["_"+r](config,i,u,e,o),s}),t
     }({
diff --git a/layout/_third-party/analytics/baidu-analytics.swig b/layout/_third-party/analytics/baidu-analytics.swig
index f59e4838f3..4f35cef856 100644
--- a/layout/_third-party/analytics/baidu-analytics.swig
+++ b/layout/_third-party/analytics/baidu-analytics.swig
@@ -1,5 +1,5 @@
 {%- if theme.baidu_analytics %}
-  <script>
+  <script reboot>
     var _hmt = _hmt || [];
     (function() {
       var hm = document.createElement("script");
diff --git a/layout/_third-party/analytics/firestore.swig b/layout/_third-party/analytics/firestore.swig
index b0b54aeb3a..553059be9f 100644
--- a/layout/_third-party/analytics/firestore.swig
+++ b/layout/_third-party/analytics/firestore.swig
@@ -4,7 +4,7 @@
   {%- if theme.firestore.bluebird %}
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.5.1/bluebird.core.min.js"></script>
   {%- endif %}
-  <script>
+  <script reboot>
     (function () {
 
       firebase.initializeApp({
diff --git a/layout/_third-party/analytics/google-analytics.swig b/layout/_third-party/analytics/google-analytics.swig
index 8d931a350c..44b32398e0 100644
--- a/layout/_third-party/analytics/google-analytics.swig
+++ b/layout/_third-party/analytics/google-analytics.swig
@@ -1,6 +1,6 @@
 {%- if theme.google_analytics.tracking_id %}
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ theme.google_analytics.tracking_id }}"></script>
-  <script>
+  <script reboot>
     var host = window.location.hostname;
     if (host !== "localhost" || !{{theme.google_analytics.localhost_ignored}}) {
       window.dataLayer = window.dataLayer || [];
diff --git a/layout/_third-party/analytics/growingio.swig b/layout/_third-party/analytics/growingio.swig
index 08b7724c3d..d1bc0daebb 100644
--- a/layout/_third-party/analytics/growingio.swig
+++ b/layout/_third-party/analytics/growingio.swig
@@ -1,5 +1,5 @@
 {%- if theme.growingio_analytics %}
-  <script>
+  <script reboot>
     !function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.growingio.com/2.1/gio.js","gio");
     gio('init','{{theme.growingio_analytics}}', {});
     gio('send');
diff --git a/layout/_third-party/analytics/lean-analytics.swig b/layout/_third-party/analytics/lean-analytics.swig
index 64bb1bdf37..b8c6d997a7 100644
--- a/layout/_third-party/analytics/lean-analytics.swig
+++ b/layout/_third-party/analytics/lean-analytics.swig
@@ -1,6 +1,6 @@
 {%- if theme.leancloud_visitors.enable and !theme.valine.visitor %}
   {# custom analytics part create by xiamo; edited by LEAFERx #}
-  <script>
+  <script reboot>
     {%- if page.layout === 'post' %}
     function addCount(Counter) {
       var $visitors = $('.leancloud_visitors');
diff --git a/layout/_third-party/baidu-push.swig b/layout/_third-party/baidu-push.swig
index b86c8e33dd..56b9db418d 100644
--- a/layout/_third-party/baidu-push.swig
+++ b/layout/_third-party/baidu-push.swig
@@ -1,5 +1,5 @@
 {%- if theme.baidu_push %}
-  <script>
+  <script reboot>
     (function(){
       var bp = document.createElement('script');
       var curProtocol = window.location.protocol.split(':')[0];
diff --git a/layout/_third-party/bookmark.swig b/layout/_third-party/bookmark.swig
index d25de7bea4..4c26827616 100644
--- a/layout/_third-party/bookmark.swig
+++ b/layout/_third-party/bookmark.swig
@@ -4,7 +4,7 @@
     {%- set bookmark_uri = theme.vendors.bookmark %}
   {%- endif %}
   <script src="{{ bookmark_uri }}"></script>
-  <script>
+  <script reboot>
   {%- if is_post() %}
     bookmark.scrollToMark('{{ theme.bookmark.save }}', "#{{ __('post.more') }}");
   {% else %}
diff --git a/layout/_third-party/comments/disqus.swig b/layout/_third-party/comments/disqus.swig
index 98f59d4fd5..a473d6c3fe 100644
--- a/layout/_third-party/comments/disqus.swig
+++ b/layout/_third-party/comments/disqus.swig
@@ -1,5 +1,5 @@
 {%- if theme.disqus.count %}
-<script>
+<script reboot>
   function loadCount() {
     var d = document, s = d.createElement('script');
     s.src = 'https://{{ theme.disqus.shortname }}.disqus.com/count.js';
@@ -11,7 +11,7 @@
 </script>
 {%- endif %}
 {%- if page.comments %}
-<script>
+<script reboot>
   var disqus_config = function() {
     this.page.url = {{ page.permalink | json }};
     this.page.identifier = {{ page.path | json }};
diff --git a/layout/_third-party/comments/disqusjs.swig b/layout/_third-party/comments/disqusjs.swig
index 32b474a259..f984a5c92b 100644
--- a/layout/_third-party/comments/disqusjs.swig
+++ b/layout/_third-party/comments/disqusjs.swig
@@ -10,7 +10,7 @@
   {%- set disqusjs_js_url = theme.vendors.disqusjs_js %}
 {%- endif %}
 
-<script>
+<script reboot>
   function initialDsq() {
     window.dsqjs = new DisqusJS({
       api: '{{ theme.disqusjs.api }}' || 'https://disqus.com/api/',
diff --git a/layout/_third-party/comments/gitalk.swig b/layout/_third-party/comments/gitalk.swig
index 003c39ceed..bca7960f88 100644
--- a/layout/_third-party/comments/gitalk.swig
+++ b/layout/_third-party/comments/gitalk.swig
@@ -17,7 +17,7 @@
 {%- endif %}
 <script src="{{ md5_url }}"></script>
 
-<script>
+<script reboot>
   var gitalk = new Gitalk({
     clientID: '{{ theme.gitalk.client_id }}',
     clientSecret: '{{ theme.gitalk.client_secret }}',
diff --git a/layout/_third-party/comments/livere.swig b/layout/_third-party/comments/livere.swig
index 1b78cc0301..d768046510 100644
--- a/layout/_third-party/comments/livere.swig
+++ b/layout/_third-party/comments/livere.swig
@@ -4,7 +4,7 @@
   {%- set liveRefer = page.path.replace('index.html', '') %}
 {%- endif %}
 
-<script>
+<script reboot>
   window.livereOptions = {
     refer: '{{ liveRefer }}'
   };
diff --git a/layout/_third-party/comments/valine.swig b/layout/_third-party/comments/valine.swig
index bf9fe2b3ec..f513f4a0e3 100644
--- a/layout/_third-party/comments/valine.swig
+++ b/layout/_third-party/comments/valine.swig
@@ -2,9 +2,9 @@
 {%- if theme.vendors.valine %}
   {%- set valine_uri = theme.vendors.valine %}
 {%- endif %}
-<script src="{{ valine_uri }}"></script>
+<script reboot src="{{ valine_uri }}"></script>
 
-<script>
+<script reboot>
   var GUEST = ['nick', 'mail', 'link'];
   var guest = '{{ theme.valine.guest_info }}';
   guest = guest.split(',').filter(function(item) {
diff --git a/layout/_third-party/facebook-sdk.swig b/layout/_third-party/facebook-sdk.swig
index 5deabf0bf4..bdf6638109 100644
--- a/layout/_third-party/facebook-sdk.swig
+++ b/layout/_third-party/facebook-sdk.swig
@@ -1,5 +1,5 @@
 {%- if theme.facebook_sdk.enable %}
-  <script>
+  <script reboot>
     window.fbAsyncInit = function() {
       FB.init({
         appId  : '{{ theme.facebook_sdk.app_id }}',
diff --git a/layout/_third-party/index.swig b/layout/_third-party/index.swig
index 0caaf25c9a..6beb262693 100644
--- a/layout/_third-party/index.swig
+++ b/layout/_third-party/index.swig
@@ -1,5 +1,4 @@
 {% include 'baidu-push.swig' %}
-{% include 'schedule.swig' %}
 {% include 'math/index.swig' %}
 {% include 'quicklink.swig' %}
 {% include 'bookmark.swig' %}
diff --git a/layout/_third-party/math/katex.swig b/layout/_third-party/math/katex.swig
index a0ec731d19..96b26e02a2 100644
--- a/layout/_third-party/math/katex.swig
+++ b/layout/_third-party/math/katex.swig
@@ -1,7 +1,7 @@
 <link rel="stylesheet" href="{{ theme.math.katex.cdn }}">
 {%- if theme.math.katex.copy_tex.enable %}
   {%- if theme.math.katex.copy_tex.copy_tex_js %}
-    <script src="{{ theme.math.katex.copy_tex.copy_tex_js }}"></script>
+    <script reboot src="{{ theme.math.katex.copy_tex.copy_tex_js }}"></script>
   {%- endif %}
   {%- if theme.math.katex.copy_tex.copy_tex_css %}
     <link rel="stylesheet" href="{{ theme.math.katex.copy_tex.copy_tex_css }}">
diff --git a/layout/_third-party/math/mathjax.swig b/layout/_third-party/math/mathjax.swig
index 2ac17b31d6..d071fc2650 100644
--- a/layout/_third-party/math/mathjax.swig
+++ b/layout/_third-party/math/mathjax.swig
@@ -44,4 +44,4 @@
     }
   });
 </script>
-<script src="{{ theme.math.mathjax.cdn }}"></script>
+<script reboot src="{{ theme.math.mathjax.cdn }}"></script>
diff --git a/layout/_third-party/quicklink.swig b/layout/_third-party/quicklink.swig
index c94f474d07..2dbc925fea 100644
--- a/layout/_third-party/quicklink.swig
+++ b/layout/_third-party/quicklink.swig
@@ -18,7 +18,7 @@
   
   {%- if loadQL or (page.quicklink or post.quicklink) %}
     <script src="{{ quicklink_uri }}"></script>
-    <script>
+    <script reboot>
       {%- if theme.quicklink.delay %}
         window.addEventListener('load', () => {
       {%- endif %}
diff --git a/layout/_third-party/rating.swig b/layout/_third-party/rating.swig
index 0fd9513032..972814d013 100644
--- a/layout/_third-party/rating.swig
+++ b/layout/_third-party/rating.swig
@@ -1,5 +1,5 @@
 {%- if theme.rating.enable and (not is_home() and is_post()) %}
-  <script>
+  <script reboot>
     wpac_init = window.wpac_init || [];
     wpac_init.push({
       widget: 'Rating',
diff --git a/layout/_third-party/schedule.swig b/layout/_third-party/schedule.swig
index 22a9a7ff66..4c719a1c9b 100644
--- a/layout/_third-party/schedule.swig
+++ b/layout/_third-party/schedule.swig
@@ -1,5 +1,3 @@
-{%- if theme.calendar.enable && page.type === 'schedule' %}
-
 <script>
 // Initialization
 var calendar = {
@@ -166,5 +164,3 @@ function buildEventDOM(tense, event) {
   return eventContent;
 }
 </script>
-
-{%- endif %}
diff --git a/layout/_third-party/tags/mermaid.swig b/layout/_third-party/tags/mermaid.swig
index 78296e5a98..560362f740 100644
--- a/layout/_third-party/tags/mermaid.swig
+++ b/layout/_third-party/tags/mermaid.swig
@@ -1,21 +1,26 @@
 {%- if theme.mermaid.enable %}
-<script>
-if ($('body').find('pre.mermaid').length) {
-  $.ajax({
-    type: 'GET',
-    url: '{{ theme.mermaid.cdn }}',
-    dataType: 'script',
-    cache: true,
-    success: function() {
-      mermaid.initialize({
-        theme: '{{ theme.mermaid.theme }}',
-        logLevel: 3,
-        flowchart: { curve: 'linear' },
-        gantt: { axisFormat: '%m/%d/%Y' },
-        sequence: { actorMargin: 50 }
-      });
-    }
+<script reboot>
+function embedMermaid() {
+  mermaid.initialize({
+    theme: '{{ theme.mermaid.theme }}',
+    logLevel: 3,
+    flowchart: { curve: 'linear' },
+    gantt: { axisFormat: '%m/%d/%Y' },
+    sequence: { actorMargin: 50 }
   });
 }
+if ($('body').find('pre.mermaid').length) {
+  if (mermaid) {
+    embedMermaid();
+  } else {
+    $.ajax({
+      type: 'GET',
+      url: '{{ theme.mermaid.cdn }}',
+      dataType: 'script',
+      cache: true,
+      success: embedMermaid
+    });
+  }
+}
 </script>
 {%- endif %}
diff --git a/layout/_third-party/tags/pdf.swig b/layout/_third-party/tags/pdf.swig
index 54cdad0e9e..fe84233dd0 100644
--- a/layout/_third-party/tags/pdf.swig
+++ b/layout/_third-party/tags/pdf.swig
@@ -1,27 +1,32 @@
 {%- if theme.pdf.enable %}
-<script>
-if ($('body').find('div.pdf').length) {
-  $.ajax({
-    type: 'GET',
-    url: '{{ theme.pdf.pdfobject.cdn }}',
-    dataType: 'script',
-    cache: true,
-    success: function() {
-      $('body').find('div.pdf').each(function(i, o) {
-        PDFObject.embed($(o).attr('target'), $(o), {
-          pdfOpenParams: {
-            navpanes: 0,
-            toolbar: 0,
-            statusbar: 0,
-            pagemode: 'thumbs',
-            view: 'FitH'
-          },
-          PDFJS_URL: '/lib/pdf/web/viewer.html',
-          height: $(o).attr('height') || '{{ theme.pdf.height }}'
-        });
-      });
-    },
+<script reboot>
+function embedPDF() {
+  $('body').find('div.pdf').each(function(i, o) {
+    PDFObject.embed($(o).attr('target'), $(o), {
+      pdfOpenParams: {
+        navpanes: 0,
+        toolbar: 0,
+        statusbar: 0,
+        pagemode: 'thumbs',
+        view: 'FitH'
+      },
+      PDFJS_URL: '/lib/pdf/web/viewer.html',
+      height: $(o).attr('height') || '{{ theme.pdf.height }}'
+    });
   });
 }
+if ($('body').find('div.pdf').length) {
+  if (PDFObject) {
+    embedPDF();
+  } else {
+    $.ajax({
+      type: 'GET',
+      url: '{{ theme.pdf.pdfobject.cdn }}',
+      dataType: 'script',
+      cache: true,
+      success: embedPDF
+    });
+  }
+}
 </script>
 {%- endif %}
diff --git a/layout/_third-party/vkontakte-api.swig b/layout/_third-party/vkontakte-api.swig
index bf7c4da85d..c4f6d17bb9 100644
--- a/layout/_third-party/vkontakte-api.swig
+++ b/layout/_third-party/vkontakte-api.swig
@@ -1,6 +1,6 @@
 {%- if theme.vkontakte_api.enable %}
   <div id="vk_api_transport"></div>
-  <script>
+  <script reboot>
     window.vkAsyncInit = function() {
       VK.init({
         apiId: {{ theme.vkontakte_api.app_id }}
diff --git a/layout/schedule.swig b/layout/schedule.swig
index 9e7b747425..e2488c48bc 100644
--- a/layout/schedule.swig
+++ b/layout/schedule.swig
@@ -8,6 +8,7 @@
       </ul>
     </div>
   </div>
+  {% include '_third-party/schedule.swig' %}
   {##########################}
   {### END SCHEDULE BLOCK ###}
   {##########################}

From a5682015e2ddf35e5f0f8aab17fc2ce3b15a0ba0 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 01:27:42 +0800
Subject: [PATCH 08/30] Update

---
 layout/_layout.swig                               |  1 +
 layout/_partials/analytics/cnzz-analytics.swig    |  2 +-
 layout/_partials/head/head-unique.swig            |  7 ++++++-
 layout/_partials/head/head.swig                   |  2 +-
 layout/_third-party/analytics/firestore.swig      | 10 ++--------
 layout/_third-party/analytics/lean-analytics.swig | 12 ++++++------
 layout/_third-party/bookmark.swig                 |  8 ++++----
 layout/_third-party/math/index.swig               |  4 ++--
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index e7f2c7dee2..01a286d88f 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -104,6 +104,7 @@
       selectors: [
         'title',
         'meta[name=description]',
+        '#page-configurations',
         '#main'
       ]
     });
diff --git a/layout/_partials/analytics/cnzz-analytics.swig b/layout/_partials/analytics/cnzz-analytics.swig
index 29b88147a6..23a3c90536 100644
--- a/layout/_partials/analytics/cnzz-analytics.swig
+++ b/layout/_partials/analytics/cnzz-analytics.swig
@@ -1,5 +1,5 @@
 {%- if theme.cnzz_siteid %}
   <div style="display: none;">
-    <script  rebootsrc="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
+    <script reboot src="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
   </div>
 {%- endif %}
diff --git a/layout/_partials/head/head-unique.swig b/layout/_partials/head/head-unique.swig
index 67fc5e0cfe..4ee4ae3393 100644
--- a/layout/_partials/head/head-unique.swig
+++ b/layout/_partials/head/head-unique.swig
@@ -14,8 +14,13 @@
 {%- endif %}
 
 {# Exports some front-matter variables to Front-End #}
-<script id="page.configurations">
+<script id="page-configurations">
+  // https://hexo.io/docs/variables.html
   CONFIG.page = {
     sidebar: {{ page.sidebar | json_encode }},
+    isHome: {{ is_home() }},
+    isPost: {{ is_post() }},
+    isPage: {{ is_page() }},
+    isArchive: {{ is_archive() }}
   };
 </script>
diff --git a/layout/_partials/head/head.swig b/layout/_partials/head/head.swig
index 8982502fca..edc15c084c 100644
--- a/layout/_partials/head/head.swig
+++ b/layout/_partials/head/head.swig
@@ -93,7 +93,7 @@
 {%- endif %}
 
 {# Export some HEXO Configurations to Front-End #}
-<script id="hexo.configurations">
+<script id="hexo-configurations">
   var NexT = window.NexT || {};
   var CONFIG = {
     root: '{{ theme.root }}',
diff --git a/layout/_third-party/analytics/firestore.swig b/layout/_third-party/analytics/firestore.swig
index 553059be9f..ce83a3e6a8 100644
--- a/layout/_third-party/analytics/firestore.swig
+++ b/layout/_third-party/analytics/firestore.swig
@@ -66,19 +66,13 @@
       var db = firebase.firestore()
       var articles = db.collection('{{ theme.firestore.collection }}')
 
-      //https://hexo.io/docs/variables.html
-      var isPost = '{{ page.title }}'.length > 0
-      var isArchive = '{{ page.archive }}' === 'true'
-      var isCategory = '{{ page.category }}'.length > 0
-      var isTag = '{{ page.tag }}'.length > 0
-
-      if (isPost) { //is article page
+      if (CONFIG.page.isPost) { //is article page
         var title = '{{ page.title }}'
         var doc = articles.doc(title)
 
         getCount(doc, true).then(appendCountTo($('.post-meta')))
       }
-      else if (!isArchive && !isCategory && !isTag) { //is index page
+      else if (CONFIG.page.isHome) { //is index page
         var titles = [] //array to titles
 
         var postsstr = '{%- for post in page.posts %}titles.push("{{ post.title }}");{%- endfor %}' //if you have a better way to get titles of posts, please change it
diff --git a/layout/_third-party/analytics/lean-analytics.swig b/layout/_third-party/analytics/lean-analytics.swig
index b8c6d997a7..441c228367 100644
--- a/layout/_third-party/analytics/lean-analytics.swig
+++ b/layout/_third-party/analytics/lean-analytics.swig
@@ -1,7 +1,7 @@
 {%- if theme.leancloud_visitors.enable and !theme.valine.visitor %}
   {# custom analytics part create by xiamo; edited by LEAFERx #}
   <script reboot>
-    {%- if page.layout === 'post' %}
+  if (CONFIG.page.isPost) {
     function addCount(Counter) {
       var $visitors = $('.leancloud_visitors');
       var url = $visitors.attr('id').trim();
@@ -46,7 +46,7 @@
           console.log(`LeanCloud Counter Error: ${responseJSON.code} ${responseJSON.error}`);
         });
     }
-    {% else %}
+  } else {
     function showTime(Counter) {
       var entries = [];
       var $visitors = $('.leancloud_visitors');
@@ -85,7 +85,7 @@
           console.log(`LeanCloud Counter Error: ${responseJSON.code} ${responseJSON.error}`);
         });
     }
-    {%- endif %}
+  }
 
     $(function() {
       $.get('https://app-router.leancloud.cn/2/route?appId=' + '{{ theme.leancloud_visitors.app_id }}')
@@ -102,15 +102,15 @@
               data: data
             });
           };
-          {%- if page.layout === 'post' %}
+          if (CONFIG.page.isPost) {
             const localhost = /http:\/\/(localhost|127.0.0.1|0.0.0.0)/;
             if (localhost.test(document.URL)) return;
             addCount(Counter);
-          {% else %}
+          } else {
             if ($('.post-title-link').length >= 1) {
               showTime(Counter);
             }
-          {%- endif %}
+          }
         });
     });
   </script>
diff --git a/layout/_third-party/bookmark.swig b/layout/_third-party/bookmark.swig
index 4c26827616..af02d98e3b 100644
--- a/layout/_third-party/bookmark.swig
+++ b/layout/_third-party/bookmark.swig
@@ -1,14 +1,14 @@
-{%- if theme.bookmark and theme.bookmark.enable %}
+{%- if theme.bookmark.enable %}
   {%- set bookmark_uri = url_for(theme.vendors._internal + '/bookmark/bookmark.min.js?v=1.0') %}
   {%- if theme.vendors.bookmark %}
     {%- set bookmark_uri = theme.vendors.bookmark %}
   {%- endif %}
   <script src="{{ bookmark_uri }}"></script>
   <script reboot>
-  {%- if is_post() %}
+  if (CONFIG.page.isPost) {
     bookmark.scrollToMark('{{ theme.bookmark.save }}', "#{{ __('post.more') }}");
-  {% else %}
+  } else {
     bookmark.loadBookmark();
-  {%- endif %}
+  }
   </script>
 {%- endif %}
diff --git a/layout/_third-party/math/index.swig b/layout/_third-party/math/index.swig
index e92a564213..b62ed75035 100644
--- a/layout/_third-party/math/index.swig
+++ b/layout/_third-party/math/index.swig
@@ -2,7 +2,7 @@
   {%- set is_index_has_math = false %}
 
   {# At home, check if there has `mathjax: true` post #}
-  {%- if is_home() %}
+  {%- if is_home() and theme.math.per_page %}
     {%- for post in page.posts %}
       {%- if post.mathjax and not is_index_has_math %}
         {%- set is_index_has_math = true %}
@@ -10,7 +10,7 @@
     {%- endfor %}
   {%- endif %}
 
-  {%- if not theme.math.per_page or (is_index_has_math or page.mathjax) %}
+  {%- if not theme.math.per_page or is_index_has_math or page.mathjax %}
     {%- if theme.math.engine == 'mathjax' %}
       {% include 'mathjax.swig' %}
     {% elif theme.math.engine == 'katex' %}

From 71c0d0fc7090807fbb803e90f1b5b214e6a77c49 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 01:39:55 +0800
Subject: [PATCH 09/30] Update

---
 layout/_layout.swig                        | 6 ++++++
 layout/_partials/head/head.swig            | 7 ++-----
 layout/_third-party/comments/disqus.swig   | 4 ++--
 layout/_third-party/comments/disqusjs.swig | 2 +-
 layout/_third-party/comments/gitalk.swig   | 2 +-
 layout/_third-party/comments/livere.swig   | 9 ++-------
 layout/_third-party/comments/valine.swig   | 4 ++--
 source/js/local-search.js                  | 4 ++--
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 01a286d88f..3575ce04b1 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -94,11 +94,16 @@
 
   {% include '_third-party/index.swig' %}
 
+  {%- if theme.pjax %}
+  <div id="bodyend">
+  {%- endif %}
+
   {%- for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
   {%- endfor %}
 
   {%- if theme.pjax %}
+  </div>
     <script>
     var pjax = new Pjax({
       selectors: [
@@ -113,6 +118,7 @@
       $('script[reboot]').each(function(i, o) {
         $(o).parent().append($(o).remove());
       });
+      $('#bodyend script').remove().appendTo($('#bodyend'));
       // Define Motion Sequence & Bootstrap Motion.
       CONFIG.motion.enable && NexT.motion.integrator
         .init()
diff --git a/layout/_partials/head/head.swig b/layout/_partials/head/head.swig
index edc15c084c..d6df3f0a75 100644
--- a/layout/_partials/head/head.swig
+++ b/layout/_partials/head/head.swig
@@ -96,7 +96,7 @@
 <script id="hexo-configurations">
   var NexT = window.NexT || {};
   var CONFIG = {
-    root: '{{ theme.root }}',
+    root: '{{ config.root }}',
     scheme: '{{ theme.scheme }}',
     version: '{{ version }}',
     sidebar: {{ theme.sidebar | json_encode }},
@@ -114,10 +114,7 @@
       labels: {{ theme.algolia_search.labels | json_encode }}
     },
     localsearch: {{ theme.local_search | json_encode }},
-    search: {
-      root: '{{ config.root }}',
-      path: '{{ config.search.path }}'
-    },
+    path: '{{ config.search.path }}',
     tabs: {{ theme.tabs.enable }},
     motion: {{ theme.motion | json_encode }},
     translation: {
diff --git a/layout/_third-party/comments/disqus.swig b/layout/_third-party/comments/disqus.swig
index a473d6c3fe..98f59d4fd5 100644
--- a/layout/_third-party/comments/disqus.swig
+++ b/layout/_third-party/comments/disqus.swig
@@ -1,5 +1,5 @@
 {%- if theme.disqus.count %}
-<script reboot>
+<script>
   function loadCount() {
     var d = document, s = d.createElement('script');
     s.src = 'https://{{ theme.disqus.shortname }}.disqus.com/count.js';
@@ -11,7 +11,7 @@
 </script>
 {%- endif %}
 {%- if page.comments %}
-<script reboot>
+<script>
   var disqus_config = function() {
     this.page.url = {{ page.permalink | json }};
     this.page.identifier = {{ page.path | json }};
diff --git a/layout/_third-party/comments/disqusjs.swig b/layout/_third-party/comments/disqusjs.swig
index f984a5c92b..32b474a259 100644
--- a/layout/_third-party/comments/disqusjs.swig
+++ b/layout/_third-party/comments/disqusjs.swig
@@ -10,7 +10,7 @@
   {%- set disqusjs_js_url = theme.vendors.disqusjs_js %}
 {%- endif %}
 
-<script reboot>
+<script>
   function initialDsq() {
     window.dsqjs = new DisqusJS({
       api: '{{ theme.disqusjs.api }}' || 'https://disqus.com/api/',
diff --git a/layout/_third-party/comments/gitalk.swig b/layout/_third-party/comments/gitalk.swig
index bca7960f88..003c39ceed 100644
--- a/layout/_third-party/comments/gitalk.swig
+++ b/layout/_third-party/comments/gitalk.swig
@@ -17,7 +17,7 @@
 {%- endif %}
 <script src="{{ md5_url }}"></script>
 
-<script reboot>
+<script>
   var gitalk = new Gitalk({
     clientID: '{{ theme.gitalk.client_id }}',
     clientSecret: '{{ theme.gitalk.client_secret }}',
diff --git a/layout/_third-party/comments/livere.swig b/layout/_third-party/comments/livere.swig
index d768046510..83d79b722b 100644
--- a/layout/_third-party/comments/livere.swig
+++ b/layout/_third-party/comments/livere.swig
@@ -1,12 +1,7 @@
 {%- if page.comments %}
-{%- set liveRefer = page.path %}
-{%- if not is_post() %}
-  {%- set liveRefer = page.path.replace('index.html', '') %}
-{%- endif %}
-
-<script reboot>
+<script>
   window.livereOptions = {
-    refer: '{{ liveRefer }}'
+    refer: location.pathname.replace(CONFIG.root, '').replace('index.html', '')
   };
   (function(d, s) {
     var j, e = d.getElementsByTagName(s)[0];
diff --git a/layout/_third-party/comments/valine.swig b/layout/_third-party/comments/valine.swig
index f513f4a0e3..bf9fe2b3ec 100644
--- a/layout/_third-party/comments/valine.swig
+++ b/layout/_third-party/comments/valine.swig
@@ -2,9 +2,9 @@
 {%- if theme.vendors.valine %}
   {%- set valine_uri = theme.vendors.valine %}
 {%- endif %}
-<script reboot src="{{ valine_uri }}"></script>
+<script src="{{ valine_uri }}"></script>
 
-<script reboot>
+<script>
   var GUEST = ['nick', 'mail', 'link'];
   var guest = '{{ theme.valine.guest_info }}';
   guest = guest.split(',').filter(function(item) {
diff --git a/source/js/local-search.js b/source/js/local-search.js
index bfd210f60b..e7a8ed8a6a 100644
--- a/source/js/local-search.js
+++ b/source/js/local-search.js
@@ -6,13 +6,13 @@ $(document).on('DOMContentLoaded', function() {
   var datas;
   var isXml = true;
   // Search DB path
-  var searchPath = CONFIG.search.path;
+  var searchPath = CONFIG.path;
   if (searchPath.length === 0) {
     searchPath = 'search.xml';
   } else if (/json$/i.test(searchPath)) {
     isXml = false;
   }
-  var path = CONFIG.search.root + searchPath;
+  var path = CONFIG.root + searchPath;
   var input = document.getElementById('local-search-input');
   var resultContent = document.getElementById('local-search-result');
 

From 9557fe461d2e84b4bea683a412a863dfa867a7f1 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 02:08:41 +0800
Subject: [PATCH 10/30] Update

---
 layout/_layout.swig                    | 3 +++
 layout/_third-party/index.swig         | 2 --
 layout/_third-party/math/katex.swig    | 2 +-
 layout/_third-party/math/mathjax.swig  | 2 +-
 layout/_third-party/quicklink.swig     | 2 +-
 layout/_third-party/rating.swig        | 4 +++-
 layout/_third-party/vkontakte-api.swig | 6 ++++--
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 3575ce04b1..3ad85b98fb 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -98,6 +98,9 @@
   <div id="bodyend">
   {%- endif %}
 
+  {% include '_third-party/math/index.swig' %}
+  {% include '_third-party/quicklink.swig' %}
+
   {%- for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
   {%- endfor %}
diff --git a/layout/_third-party/index.swig b/layout/_third-party/index.swig
index 6beb262693..b5dbec00ff 100644
--- a/layout/_third-party/index.swig
+++ b/layout/_third-party/index.swig
@@ -1,6 +1,4 @@
 {% include 'baidu-push.swig' %}
-{% include 'math/index.swig' %}
-{% include 'quicklink.swig' %}
 {% include 'bookmark.swig' %}
 
 {% include 'analytics/analytics-with-jquery.swig' %}
diff --git a/layout/_third-party/math/katex.swig b/layout/_third-party/math/katex.swig
index 96b26e02a2..a0ec731d19 100644
--- a/layout/_third-party/math/katex.swig
+++ b/layout/_third-party/math/katex.swig
@@ -1,7 +1,7 @@
 <link rel="stylesheet" href="{{ theme.math.katex.cdn }}">
 {%- if theme.math.katex.copy_tex.enable %}
   {%- if theme.math.katex.copy_tex.copy_tex_js %}
-    <script reboot src="{{ theme.math.katex.copy_tex.copy_tex_js }}"></script>
+    <script src="{{ theme.math.katex.copy_tex.copy_tex_js }}"></script>
   {%- endif %}
   {%- if theme.math.katex.copy_tex.copy_tex_css %}
     <link rel="stylesheet" href="{{ theme.math.katex.copy_tex.copy_tex_css }}">
diff --git a/layout/_third-party/math/mathjax.swig b/layout/_third-party/math/mathjax.swig
index d071fc2650..2ac17b31d6 100644
--- a/layout/_third-party/math/mathjax.swig
+++ b/layout/_third-party/math/mathjax.swig
@@ -44,4 +44,4 @@
     }
   });
 </script>
-<script reboot src="{{ theme.math.mathjax.cdn }}"></script>
+<script src="{{ theme.math.mathjax.cdn }}"></script>
diff --git a/layout/_third-party/quicklink.swig b/layout/_third-party/quicklink.swig
index 2dbc925fea..c94f474d07 100644
--- a/layout/_third-party/quicklink.swig
+++ b/layout/_third-party/quicklink.swig
@@ -18,7 +18,7 @@
   
   {%- if loadQL or (page.quicklink or post.quicklink) %}
     <script src="{{ quicklink_uri }}"></script>
-    <script reboot>
+    <script>
       {%- if theme.quicklink.delay %}
         window.addEventListener('load', () => {
       {%- endif %}
diff --git a/layout/_third-party/rating.swig b/layout/_third-party/rating.swig
index 972814d013..ac33cdb0ac 100644
--- a/layout/_third-party/rating.swig
+++ b/layout/_third-party/rating.swig
@@ -1,5 +1,6 @@
-{%- if theme.rating.enable and (not is_home() and is_post()) %}
+{%- if theme.rating.enable %}
   <script reboot>
+  if (CONFIG.page.isPost) {
     wpac_init = window.wpac_init || [];
     wpac_init.push({
       widget: 'Rating',
@@ -16,5 +17,6 @@
       mc.src = '//embed.widgetpack.com/widget.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(mc, s.nextSibling);
     })();
+  }
   </script>
 {%- endif %}
diff --git a/layout/_third-party/vkontakte-api.swig b/layout/_third-party/vkontakte-api.swig
index c4f6d17bb9..2d87d02c00 100644
--- a/layout/_third-party/vkontakte-api.swig
+++ b/layout/_third-party/vkontakte-api.swig
@@ -6,8 +6,10 @@
         apiId: {{ theme.vkontakte_api.app_id }}
       });
 
-      {%- if not is_home() and (is_post() and theme.vkontakte_api.like) %}
-        VK.Widgets.Like("vk_like", {type: "mini", height: 20});
+      {%- if theme.vkontakte_api.like %}
+        if (CONFIG.page.isPost) {
+          VK.Widgets.Like("vk_like", {type: "mini", height: 20});
+        }
       {%- endif %}
 
       {%- if page.comments and theme.vkontakte_api.comments %}

From c309237df6a103e905db463070a9c9eca7c3b5b1 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 02:26:09 +0800
Subject: [PATCH 11/30] Indent

---
 layout/_layout.swig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 3ad85b98fb..a0e3f64c3e 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -95,7 +95,7 @@
   {% include '_third-party/index.swig' %}
 
   {%- if theme.pjax %}
-  <div id="bodyend">
+    <div id="bodyend">
   {%- endif %}
 
   {% include '_third-party/math/index.swig' %}
@@ -106,7 +106,7 @@
   {%- endfor %}
 
   {%- if theme.pjax %}
-  </div>
+    </div>
     <script>
     var pjax = new Pjax({
       selectors: [

From 29eec55a96bfc707f13f14192c169c8a0b996104 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 12:40:31 +0800
Subject: [PATCH 12/30] Reboot script_extra

---
 layout/_layout.swig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index a0e3f64c3e..73749bcc68 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -85,8 +85,6 @@
   {%- set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %}
   {% include scheme_script %}
 
-  {% block script_extra %}{% endblock %}
-
   {% include '_scripts/next-boot.swig' %}
   {% include '_scripts/scroll-cookie.swig' %}
   {% include '_scripts/exturl.swig' %}
@@ -101,6 +99,8 @@
   {% include '_third-party/math/index.swig' %}
   {% include '_third-party/quicklink.swig' %}
 
+  {% block script_extra %}{% endblock %}
+
   {%- for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
   {%- endfor %}

From 9f669e64f160d385114ef0b79990cb9ab3202b1e Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 16:54:57 +0800
Subject: [PATCH 13/30] Update

---
 layout/_layout.swig                             | 17 ++++++++++++-----
 .../_partials/analytics/busuanzi-counter.swig   |  2 +-
 layout/_partials/analytics/cnzz-analytics.swig  |  2 +-
 .../_partials/analytics/tencent-analytics.swig  |  2 +-
 layout/_partials/analytics/tencent-mta.swig     |  2 +-
 .../analytics/application-insights.swig         |  2 +-
 .../_third-party/analytics/baidu-analytics.swig |  2 +-
 layout/_third-party/analytics/firestore.swig    |  2 +-
 .../analytics/google-analytics.swig             |  2 +-
 layout/_third-party/analytics/growingio.swig    |  2 +-
 .../_third-party/analytics/lean-analytics.swig  |  2 +-
 layout/_third-party/baidu-push.swig             |  2 +-
 layout/_third-party/bookmark.swig               |  2 +-
 layout/_third-party/facebook-sdk.swig           |  2 +-
 layout/_third-party/rating.swig                 |  2 +-
 layout/_third-party/tags/mermaid.swig           |  2 +-
 layout/_third-party/tags/pdf.swig               |  2 +-
 layout/_third-party/vkontakte-api.swig          |  2 +-
 18 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 73749bcc68..9d846c5257 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -9,6 +9,10 @@
 {%- set author = __('author') !== 'author' && __('author') || config.author %}
 {%- set description = __('description') !== 'description' && __('description') || config.description %}
 
+{%- if theme.pjax %}
+  {%- set pjax = ' pjax' %}
+{%- endif %}
+
 {%- set html_class = 'theme-next ' + theme.scheme %}
 {%- if theme.motion.enable %}
   {%- set html_class = html_class + ' use-motion' %}
@@ -93,7 +97,7 @@
   {% include '_third-party/index.swig' %}
 
   {%- if theme.pjax %}
-    <div id="bodyend">
+    <div id="bodyend-pjax">
   {%- endif %}
 
   {% include '_third-party/math/index.swig' %}
@@ -113,15 +117,18 @@
         'title',
         'meta[name=description]',
         '#page-configurations',
-        '#main'
-      ]
+        '#main',
+        '#bodyend-pjax'
+      ],
+      cacheBust: false,
+      analytics: false
     });
     $(document).on('pjax:success', function() {
       $('.menu-item').css("opacity", 1);
-      $('script[reboot]').each(function(i, o) {
+      $('script[pjax]').each(function(i, o) {
         $(o).parent().append($(o).remove());
       });
-      $('#bodyend script').remove().appendTo($('#bodyend'));
+      //$('#bodyend script').remove().appendTo($('#bodyend'));
       // Define Motion Sequence & Bootstrap Motion.
       CONFIG.motion.enable && NexT.motion.integrator
         .init()
diff --git a/layout/_partials/analytics/busuanzi-counter.swig b/layout/_partials/analytics/busuanzi-counter.swig
index 1e3261dc85..c3ca3a0a9b 100644
--- a/layout/_partials/analytics/busuanzi-counter.swig
+++ b/layout/_partials/analytics/busuanzi-counter.swig
@@ -1,6 +1,6 @@
 {%- if theme.busuanzi_count.enable %}
 <div class="busuanzi-count">
-  <script reboot async src="https://busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
+  <script{{ pjax }} async src="https://busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
 
   {%- if theme.busuanzi_count.total_visitors %}
     <span class="post-meta-item-icon">
diff --git a/layout/_partials/analytics/cnzz-analytics.swig b/layout/_partials/analytics/cnzz-analytics.swig
index 23a3c90536..27988e82ec 100644
--- a/layout/_partials/analytics/cnzz-analytics.swig
+++ b/layout/_partials/analytics/cnzz-analytics.swig
@@ -1,5 +1,5 @@
 {%- if theme.cnzz_siteid %}
   <div style="display: none;">
-    <script reboot src="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
+    <script{{ pjax }} src="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
   </div>
 {%- endif %}
diff --git a/layout/_partials/analytics/tencent-analytics.swig b/layout/_partials/analytics/tencent-analytics.swig
index c82436c903..4331c37274 100644
--- a/layout/_partials/analytics/tencent-analytics.swig
+++ b/layout/_partials/analytics/tencent-analytics.swig
@@ -1,5 +1,5 @@
 {%- if theme.tencent_analytics %}
-  <script reboot>
+  <script{{ pjax }}>
     (function() {
       var hm = document.createElement("script");
       hm.src = "//tajs.qq.com/stats?sId={{ theme.tencent_analytics }}";
diff --git a/layout/_partials/analytics/tencent-mta.swig b/layout/_partials/analytics/tencent-mta.swig
index 08f8494558..fac0ebfbfb 100644
--- a/layout/_partials/analytics/tencent-mta.swig
+++ b/layout/_partials/analytics/tencent-mta.swig
@@ -1,5 +1,5 @@
 {%- if theme.tencent_mta %}
-  <script reboot>
+  <script{{ pjax }}>
     var _mtac = {};
     (function() {
       var mta = document.createElement("script");
diff --git a/layout/_third-party/analytics/application-insights.swig b/layout/_third-party/analytics/application-insights.swig
index 5bf8de9ab9..32f123ad32 100644
--- a/layout/_third-party/analytics/application-insights.swig
+++ b/layout/_third-party/analytics/application-insights.swig
@@ -1,5 +1,5 @@
 {%- if theme.application_insights %}
-  <script reboot>
+  <script{{ pjax }}>
     var appInsights=window.appInsights||function(config){
       function i(config){t[config]=function(){var i=arguments;t.queue.push(function(){t[config].apply(t,i)})}}var t={config:config},u=document,e=window,o="script",s="AuthenticatedUserContext",h="start",c="stop",l="Track",a=l+"Event",v=l+"Page",y=u.createElement(o),r,f;y.src=config.url||"https://az416426.vo.msecnd.net/scripts/a/ai.0.js";u.getElementsByTagName(o)[0].parentNode.appendChild(y);try{t.cookie=u.cookie}catch(p){}for(t.queue=[],t.version="1.0",r=["Event","Exception","Metric","PageView","Trace","Dependency"];r.length;)i("track"+r.pop());return i("set"+s),i("clear"+s),i(h+a),i(c+a),i(h+v),i(c+v),i("flush"),config.disableExceptionTracking||(r="onerror",i("_"+r),f=e[r],e[r]=function(config,i,u,e,o){var s=f&&f(config,i,u,e,o);return s!==!0&&t["_"+r](config,i,u,e,o),s}),t
     }({
diff --git a/layout/_third-party/analytics/baidu-analytics.swig b/layout/_third-party/analytics/baidu-analytics.swig
index 4f35cef856..85dde7600e 100644
--- a/layout/_third-party/analytics/baidu-analytics.swig
+++ b/layout/_third-party/analytics/baidu-analytics.swig
@@ -1,5 +1,5 @@
 {%- if theme.baidu_analytics %}
-  <script reboot>
+  <script{{ pjax }}>
     var _hmt = _hmt || [];
     (function() {
       var hm = document.createElement("script");
diff --git a/layout/_third-party/analytics/firestore.swig b/layout/_third-party/analytics/firestore.swig
index ce83a3e6a8..3e1bac0ec9 100644
--- a/layout/_third-party/analytics/firestore.swig
+++ b/layout/_third-party/analytics/firestore.swig
@@ -4,7 +4,7 @@
   {%- if theme.firestore.bluebird %}
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.5.1/bluebird.core.min.js"></script>
   {%- endif %}
-  <script reboot>
+  <script{{ pjax }}>
     (function () {
 
       firebase.initializeApp({
diff --git a/layout/_third-party/analytics/google-analytics.swig b/layout/_third-party/analytics/google-analytics.swig
index 44b32398e0..420cbfceb2 100644
--- a/layout/_third-party/analytics/google-analytics.swig
+++ b/layout/_third-party/analytics/google-analytics.swig
@@ -1,6 +1,6 @@
 {%- if theme.google_analytics.tracking_id %}
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ theme.google_analytics.tracking_id }}"></script>
-  <script reboot>
+  <script{{ pjax }}>
     var host = window.location.hostname;
     if (host !== "localhost" || !{{theme.google_analytics.localhost_ignored}}) {
       window.dataLayer = window.dataLayer || [];
diff --git a/layout/_third-party/analytics/growingio.swig b/layout/_third-party/analytics/growingio.swig
index d1bc0daebb..dd35aeed25 100644
--- a/layout/_third-party/analytics/growingio.swig
+++ b/layout/_third-party/analytics/growingio.swig
@@ -1,5 +1,5 @@
 {%- if theme.growingio_analytics %}
-  <script reboot>
+  <script{{ pjax }}>
     !function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.growingio.com/2.1/gio.js","gio");
     gio('init','{{theme.growingio_analytics}}', {});
     gio('send');
diff --git a/layout/_third-party/analytics/lean-analytics.swig b/layout/_third-party/analytics/lean-analytics.swig
index 441c228367..642b64fc25 100644
--- a/layout/_third-party/analytics/lean-analytics.swig
+++ b/layout/_third-party/analytics/lean-analytics.swig
@@ -1,6 +1,6 @@
 {%- if theme.leancloud_visitors.enable and !theme.valine.visitor %}
   {# custom analytics part create by xiamo; edited by LEAFERx #}
-  <script reboot>
+  <script{{ pjax }}>
   if (CONFIG.page.isPost) {
     function addCount(Counter) {
       var $visitors = $('.leancloud_visitors');
diff --git a/layout/_third-party/baidu-push.swig b/layout/_third-party/baidu-push.swig
index 56b9db418d..3b44a0d528 100644
--- a/layout/_third-party/baidu-push.swig
+++ b/layout/_third-party/baidu-push.swig
@@ -1,5 +1,5 @@
 {%- if theme.baidu_push %}
-  <script reboot>
+  <script{{ pjax }}>
     (function(){
       var bp = document.createElement('script');
       var curProtocol = window.location.protocol.split(':')[0];
diff --git a/layout/_third-party/bookmark.swig b/layout/_third-party/bookmark.swig
index af02d98e3b..332e49e1ba 100644
--- a/layout/_third-party/bookmark.swig
+++ b/layout/_third-party/bookmark.swig
@@ -4,7 +4,7 @@
     {%- set bookmark_uri = theme.vendors.bookmark %}
   {%- endif %}
   <script src="{{ bookmark_uri }}"></script>
-  <script reboot>
+  <script{{ pjax }}>
   if (CONFIG.page.isPost) {
     bookmark.scrollToMark('{{ theme.bookmark.save }}', "#{{ __('post.more') }}");
   } else {
diff --git a/layout/_third-party/facebook-sdk.swig b/layout/_third-party/facebook-sdk.swig
index bdf6638109..1c8d87a391 100644
--- a/layout/_third-party/facebook-sdk.swig
+++ b/layout/_third-party/facebook-sdk.swig
@@ -1,5 +1,5 @@
 {%- if theme.facebook_sdk.enable %}
-  <script reboot>
+  <script{{ pjax }}>
     window.fbAsyncInit = function() {
       FB.init({
         appId  : '{{ theme.facebook_sdk.app_id }}',
diff --git a/layout/_third-party/rating.swig b/layout/_third-party/rating.swig
index ac33cdb0ac..83fd24f2f5 100644
--- a/layout/_third-party/rating.swig
+++ b/layout/_third-party/rating.swig
@@ -1,5 +1,5 @@
 {%- if theme.rating.enable %}
-  <script reboot>
+  <script{{ pjax }}>
   if (CONFIG.page.isPost) {
     wpac_init = window.wpac_init || [];
     wpac_init.push({
diff --git a/layout/_third-party/tags/mermaid.swig b/layout/_third-party/tags/mermaid.swig
index 560362f740..536654adf5 100644
--- a/layout/_third-party/tags/mermaid.swig
+++ b/layout/_third-party/tags/mermaid.swig
@@ -1,5 +1,5 @@
 {%- if theme.mermaid.enable %}
-<script reboot>
+<script{{ pjax }}>
 function embedMermaid() {
   mermaid.initialize({
     theme: '{{ theme.mermaid.theme }}',
diff --git a/layout/_third-party/tags/pdf.swig b/layout/_third-party/tags/pdf.swig
index fe84233dd0..8be2ef83f4 100644
--- a/layout/_third-party/tags/pdf.swig
+++ b/layout/_third-party/tags/pdf.swig
@@ -1,5 +1,5 @@
 {%- if theme.pdf.enable %}
-<script reboot>
+<script{{ pjax }}>
 function embedPDF() {
   $('body').find('div.pdf').each(function(i, o) {
     PDFObject.embed($(o).attr('target'), $(o), {
diff --git a/layout/_third-party/vkontakte-api.swig b/layout/_third-party/vkontakte-api.swig
index 2d87d02c00..26232eaf2f 100644
--- a/layout/_third-party/vkontakte-api.swig
+++ b/layout/_third-party/vkontakte-api.swig
@@ -1,6 +1,6 @@
 {%- if theme.vkontakte_api.enable %}
   <div id="vk_api_transport"></div>
-  <script reboot>
+  <script{{ pjax }}>
     window.vkAsyncInit = function() {
       VK.init({
         apiId: {{ theme.vkontakte_api.app_id }}

From 1a1b9f814369ad04c0a0e73aa07ed937a1eb552d Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 23:03:29 +0800
Subject: [PATCH 14/30] Update

---
 layout/_layout.swig                 |   6 +-
 layout/_scripts/pages/schedule.swig | 312 ++++++++++++++--------------
 source/js/motion.js                 |   4 +-
 source/js/post-details.js           |  24 +--
 source/js/schemes/muse.js           |   3 +-
 source/js/scroll-cookie.js          |   4 +-
 source/js/utils.js                  |  15 +-
 7 files changed, 186 insertions(+), 182 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 9d846c5257..0a0978f94f 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -123,12 +123,16 @@
       cacheBust: false,
       analytics: false
     });
+    $(document).on('pjax:send', function() {
+      if ($('.sidebar-active').length > 0) {
+        NexT.utils.toggleSidebar();
+      }
+    })
     $(document).on('pjax:success', function() {
       $('.menu-item').css("opacity", 1);
       $('script[pjax]').each(function(i, o) {
         $(o).parent().append($(o).remove());
       });
-      //$('#bodyend script').remove().appendTo($('#bodyend'));
       // Define Motion Sequence & Bootstrap Motion.
       CONFIG.motion.enable && NexT.motion.integrator
         .init()
diff --git a/layout/_scripts/pages/schedule.swig b/layout/_scripts/pages/schedule.swig
index 120f25323c..20383505ec 100644
--- a/layout/_scripts/pages/schedule.swig
+++ b/layout/_scripts/pages/schedule.swig
@@ -1,162 +1,164 @@
 <script>
-// Initialization
-var calendar = {
-  orderBy     : 'startTime',
-  showLocation: 'false',
-  offsetMax   : 72,
-  offsetMin   : 4,
-  showDeleted : 'false',
-  singleEvents: 'true',
-  maxResults  : '250'
-}
-
-// Read config form theme config file
-Object.assign(calendar, {{ theme.calendar | json_encode }});
-
-var now = new Date();
-var timeMax = new Date();
-var timeMin = new Date();
-
-timeMax.setHours(now.getHours() + calendar.offsetMax);
-timeMin.setHours(now.getHours() - calendar.offsetMin);
-calendar.timeMaxISO      = timeMax.toISOString();
-calendar.timeMinISO      = timeMin.toISOString();
-
-// Build URL
-const BASE_URL           = 'https://www.googleapis.com/calendar/v3/calendars/';
-const FIELD_KEY          = 'key';
-const FIELD_ORDERBY      = 'orderBy';
-const FIELD_TIMEMAX      = 'timeMax';
-const FIELD_TIMEMIN      = 'timeMin';
-const FIELD_SHOWDELETED  = 'showDeleted';
-const FIELD_SINGLEEVENTS = 'singleEvents';
-const FIELD_MAXRESULTS   = 'maxResults';
-
-var request_url = BASE_URL + calendar.calendar_id  + '/events?' +
-  FIELD_KEY          + '=' + calendar.api_key      + '&' +
-  FIELD_ORDERBY      + '=' + calendar.orderBy      + '&' +
-  FIELD_TIMEMAX      + '=' + calendar.timeMaxISO   + '&' +
-  FIELD_TIMEMIN      + '=' + calendar.timeMinISO   + '&' +
-  FIELD_SHOWDELETED  + '=' + calendar.showDeleted  + '&' +
-  FIELD_SINGLEEVENTS + '=' + calendar.singleEvents + '&' +
-  FIELD_MAXRESULTS   + '=' + calendar.maxResults;
-
-
-fetchData();
-var queryLoop = setInterval(fetchData, 60000);
-
-function fetchData() {
-  fetch(request_url).then(response => {
-    return response.json();
-  }).then(data => {
-    $eventList = document.getElementById('event-list');
-
-    // Clean the event list
-    $eventList.innerHTML = '';
-    var prevEnd = 0; // used to decide where to insert an <hr>
-
-    data.items.forEach(event => {
-      // Parse data
-      var utc   = new Date().getTimezoneOffset() * 60000;
-      var start = event.start.dateTime = new Date(event.start.dateTime || (new Date(event.start.date).getTime() + utc));
-      var end   = event.end.dateTime = new Date(event.end.dateTime || (new Date(event.end.date).getTime() + utc));
-
-      tense = judgeTense(now, start, end); // 0:now 1:future -1:past
-
-      if (tense == 1 && prevEnd < now) {
-        $eventList.innerHTML += '<hr>';
-      }
-
-      eventDOM = buildEventDOM(tense, event);
-      $eventList.innerHTML += eventDOM;
-
-      prevEnd = end;
-    });
-  });
-}
-
-function getRelativeTime(current, previous) {
-  var msPerMinute = 60 * 1000;
-  var msPerHour = msPerMinute * 60;
-  var msPerDay = msPerHour * 24;
-  var msPerMonth = msPerDay * 30;
-  var msPerYear = msPerDay * 365;
-
-  var elapsed = current - previous;
-  var tense = elapsed > 0 ? 'ago' : 'later';
-
-  elapsed = Math.abs(elapsed);
-
-  if      ( elapsed < msPerHour  ) {
-    return Math.round(elapsed/msPerMinute) + ' minutes ' + tense;
-  }
-  else if ( elapsed < msPerDay   ) {
-    return Math.round(elapsed/msPerHour) + ' hours ' + tense;
+(function() {
+  // Initialization
+  var calendar = {
+    orderBy     : 'startTime',
+    showLocation: 'false',
+    offsetMax   : 72,
+    offsetMin   : 4,
+    showDeleted : 'false',
+    singleEvents: 'true',
+    maxResults  : '250'
   }
-  else if ( elapsed < msPerMonth ) {
-    return 'about ' + Math.round(elapsed/msPerDay) + ' days ' + tense;
-  }
-  else if ( elapsed < msPerYear  ) {
-    return 'about ' + Math.round(elapsed/msPerMonth) + ' months ' + tense;
+
+  // Read config form theme config file
+  Object.assign(calendar, {{ theme.calendar | json_encode }});
+
+  var now = new Date();
+  var timeMax = new Date();
+  var timeMin = new Date();
+
+  timeMax.setHours(now.getHours() + calendar.offsetMax);
+  timeMin.setHours(now.getHours() - calendar.offsetMin);
+  calendar.timeMaxISO      = timeMax.toISOString();
+  calendar.timeMinISO      = timeMin.toISOString();
+
+  // Build URL
+  const BASE_URL           = 'https://www.googleapis.com/calendar/v3/calendars/';
+  const FIELD_KEY          = 'key';
+  const FIELD_ORDERBY      = 'orderBy';
+  const FIELD_TIMEMAX      = 'timeMax';
+  const FIELD_TIMEMIN      = 'timeMin';
+  const FIELD_SHOWDELETED  = 'showDeleted';
+  const FIELD_SINGLEEVENTS = 'singleEvents';
+  const FIELD_MAXRESULTS   = 'maxResults';
+
+  var request_url = BASE_URL + calendar.calendar_id  + '/events?' +
+    FIELD_KEY          + '=' + calendar.api_key      + '&' +
+    FIELD_ORDERBY      + '=' + calendar.orderBy      + '&' +
+    FIELD_TIMEMAX      + '=' + calendar.timeMaxISO   + '&' +
+    FIELD_TIMEMIN      + '=' + calendar.timeMinISO   + '&' +
+    FIELD_SHOWDELETED  + '=' + calendar.showDeleted  + '&' +
+    FIELD_SINGLEEVENTS + '=' + calendar.singleEvents + '&' +
+    FIELD_MAXRESULTS   + '=' + calendar.maxResults;
+
+
+  fetchData();
+  var queryLoop = setInterval(fetchData, 60000);
+
+  function fetchData() {
+    fetch(request_url).then(response => {
+      return response.json();
+    }).then(data => {
+      $eventList = document.getElementById('event-list');
+
+      // Clean the event list
+      $eventList.innerHTML = '';
+      var prevEnd = 0; // used to decide where to insert an <hr>
+
+      data.items.forEach(event => {
+        // Parse data
+        var utc   = new Date().getTimezoneOffset() * 60000;
+        var start = event.start.dateTime = new Date(event.start.dateTime || (new Date(event.start.date).getTime() + utc));
+        var end   = event.end.dateTime = new Date(event.end.dateTime || (new Date(event.end.date).getTime() + utc));
+
+        tense = judgeTense(now, start, end); // 0:now 1:future -1:past
+
+        if (tense == 1 && prevEnd < now) {
+          $eventList.innerHTML += '<hr>';
+        }
+
+        eventDOM = buildEventDOM(tense, event);
+        $eventList.innerHTML += eventDOM;
+
+        prevEnd = end;
+      });
+    });
   }
-  else {
-    return 'about' + Math.round(elapsed/msPerYear) + ' years' + tense;
+
+  function getRelativeTime(current, previous) {
+    var msPerMinute = 60 * 1000;
+    var msPerHour = msPerMinute * 60;
+    var msPerDay = msPerHour * 24;
+    var msPerMonth = msPerDay * 30;
+    var msPerYear = msPerDay * 365;
+
+    var elapsed = current - previous;
+    var tense = elapsed > 0 ? 'ago' : 'later';
+
+    elapsed = Math.abs(elapsed);
+
+    if      ( elapsed < msPerHour  ) {
+      return Math.round(elapsed/msPerMinute) + ' minutes ' + tense;
+    }
+    else if ( elapsed < msPerDay   ) {
+      return Math.round(elapsed/msPerHour) + ' hours ' + tense;
+    }
+    else if ( elapsed < msPerMonth ) {
+      return 'about ' + Math.round(elapsed/msPerDay) + ' days ' + tense;
+    }
+    else if ( elapsed < msPerYear  ) {
+      return 'about ' + Math.round(elapsed/msPerMonth) + ' months ' + tense;
+    }
+    else {
+      return 'about' + Math.round(elapsed/msPerYear) + ' years' + tense;
+    }
   }
-}
-
-function judgeTense(now, eventStart, eventEnd) {
-  if      (eventEnd   < now) { return -1; }
-  else if (eventStart > now) { return  1; }
-  else                       { return  0; }
-}
-
-function buildEventDOM(tense, event) {
-  var tenseClass = '';
-  var start      = event.start.dateTime;
-  var end        = event.end.dateTime;
-  switch(tense) {
-    case 0 : // now
-      tenseClass = 'event-now';
-      break;
-    case 1 : // future
-      tenseClass = 'event-future';
-      break;
-    case -1: // past
-      tenseClass = 'event-past';
-      break;
-    default:
-      throw 'Time data error';
+
+  function judgeTense(now, eventStart, eventEnd) {
+    if      (eventEnd   < now) { return -1; }
+    else if (eventStart > now) { return  1; }
+    else                       { return  0; }
   }
-  durationFormat = {
-    weekday: 'short',
-    hour   : '2-digit',
-    minute : '2-digit'
-  };
-  relativeTimeStr = (tense == 0) ? 'NOW' : getRelativeTime(now, start);
-  durationStr = start.toLocaleTimeString([], durationFormat) + ' - ' +
-                end.toLocaleTimeString([], durationFormat);
-
-  liOpen  = '<li class="event ' + tenseClass + '">';
-  liClose = '</li>';
-  h2Open  = '<h2 class="event-summary">';
-  h2Close = '</h2>';
-
-  locationDOM     = '';
-  if (calendar.showLocation && event.location) {
-    locationDOM   = '<span class="event-location event-details">' + event.location + '</span>';
+
+  function buildEventDOM(tense, event) {
+    var tenseClass = '';
+    var start      = event.start.dateTime;
+    var end        = event.end.dateTime;
+    switch(tense) {
+      case 0 : // now
+        tenseClass = 'event-now';
+        break;
+      case 1 : // future
+        tenseClass = 'event-future';
+        break;
+      case -1: // past
+        tenseClass = 'event-past';
+        break;
+      default:
+        throw 'Time data error';
+    }
+    durationFormat = {
+      weekday: 'short',
+      hour   : '2-digit',
+      minute : '2-digit'
+    };
+    relativeTimeStr = (tense == 0) ? 'NOW' : getRelativeTime(now, start);
+    durationStr = start.toLocaleTimeString([], durationFormat) + ' - ' +
+                  end.toLocaleTimeString([], durationFormat);
+
+    liOpen  = '<li class="event ' + tenseClass + '">';
+    liClose = '</li>';
+    h2Open  = '<h2 class="event-summary">';
+    h2Close = '</h2>';
+
+    locationDOM     = '';
+    if (calendar.showLocation && event.location) {
+      locationDOM   = '<span class="event-location event-details">' + event.location + '</span>';
+    }
+    relativeTimeDOM = '<span class="event-relative-time">' + relativeTimeStr + '</span>';
+    durationDOM     = '<span class="event-duration event-details">' + durationStr + '</span>';
+
+    eventContent =
+      liOpen +
+        h2Open +
+          event.summary +
+          relativeTimeDOM+
+        h2Close +
+        locationDOM +
+        durationDOM +
+      liClose;
+    return eventContent;
   }
-  relativeTimeDOM = '<span class="event-relative-time">' + relativeTimeStr + '</span>';
-  durationDOM     = '<span class="event-duration event-details">' + durationStr + '</span>';
-
-  eventContent =
-    liOpen +
-      h2Open +
-        event.summary +
-        relativeTimeDOM+
-      h2Close +
-      locationDOM +
-      durationDOM +
-    liClose;
-  return eventContent;
-}
+})();
 </script>
diff --git a/source/js/motion.js b/source/js/motion.js
index 40bc44005d..cd0f49d430 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -179,8 +179,8 @@ NexT.motion.middleWares = {
   },
 
   sidebar: function(integrator) {
-    if (CONFIG.sidebar.display === 'always') {
-      NexT.utils.displaySidebar();
+    if (NexT.utils.isSidebarCouldDisplay()) {
+      NexT.utils.toggleSidebar();
     }
     integrator.next();
   }
diff --git a/source/js/post-details.js b/source/js/post-details.js
index b7771805b1..ff3d9aa61e 100644
--- a/source/js/post-details.js
+++ b/source/js/post-details.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).on('DOMContentLoaded', function() {
+(function() {
 
   function initScrollSpy() {
     var tocSelector = '.post-toc';
@@ -28,9 +28,7 @@ $(document).on('DOMContentLoaded', function() {
   }
 
   initScrollSpy();
-});
 
-$(document).on('DOMContentLoaded pjax:success', function() {
   var TAB_ANIMATE_DURATION = 200;
 
   $('.sidebar-nav li').on('click', function() {
@@ -70,21 +68,7 @@ $(document).on('DOMContentLoaded pjax:success', function() {
     }, 500);
   });
 
-  // Expand sidebar on post detail page by default, when post has a toc.
-  var $tocContent = $('.post-toc-content');
-  var display = CONFIG.page.sidebar;
-  if (typeof display !== 'boolean') {
-    // There's no definition sidebar in the page front-matter
-    var isSidebarCouldDisplay = CONFIG.sidebar.display === 'post'
-     || CONFIG.sidebar.display === 'always';
-    var hasTOC = $tocContent.length > 0 && $tocContent.html().trim().length > 0;
-    display = isSidebarCouldDisplay && hasTOC;
+  if (!CONFIG.motion.enable && NexT.utils.isSidebarCouldDisplay()) {
+    NexT.utils.toggleSidebar();
   }
-  if (display) {
-    CONFIG.motion.enable
-      ? NexT.motion.middleWares.sidebar = function() {
-        NexT.utils.displaySidebar();
-      }
-      : NexT.utils.displaySidebar();
-  }
-});
+})();
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index 4541d89a1d..fe7166fb96 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -132,7 +132,8 @@ $(document).on('DOMContentLoaded pjax:success', function() {
     mouseupHandler: function(e) {
       var deltaX = e.pageX - mousePos.X;
       var deltaY = e.pageY - mousePos.Y;
-      if (this.isSidebarVisible && Math.sqrt((deltaX * deltaX) + (deltaY * deltaY)) < 20 && $(e.target).is('.main')) {
+      var clickBlankPart = Math.sqrt((deltaX * deltaX) + (deltaY * deltaY)) < 20 && $(e.target).is('.main');
+      if (this.isSidebarVisible && (clickBlankPart || $(e.target).is('img.medium-zoom-image, .fancybox img'))) {
         this.clickHandler();
       }
     },
diff --git a/source/js/scroll-cookie.js b/source/js/scroll-cookie.js
index 5dbdc7bf1b..8a7049bb3b 100644
--- a/source/js/scroll-cookie.js
+++ b/source/js/scroll-cookie.js
@@ -1,6 +1,6 @@
-$(document).on('DOMContentLoaded', function() {
+/* global Cookies */
 
-  /* global Cookies */
+$(document).on('DOMContentLoaded', function() {
 
   // Set relative link path (without domain)
   var rpath = window.location.href.replace(window.location.origin, '');
diff --git a/source/js/utils.js b/source/js/utils.js
index 85ce22f22c..3631b722dc 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -291,7 +291,20 @@ NexT.utils = {
     return selector.replace(/[!"$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g, '\\$&');
   },
 
-  displaySidebar: function() {
+  isSidebarCouldDisplay: function() {
+    // Expand sidebar on post detail page by default, when post has a toc.
+    var $tocContent = $('.post-toc-content');
+    var display = CONFIG.page.sidebar;
+    if (typeof display !== 'boolean') {
+      // There's no definition sidebar in the page front-matter
+      var sidebarCouldDisplay = CONFIG.sidebar.display === 'post' || CONFIG.sidebar.display === 'always';
+      var hasTOC = $tocContent.length > 0 && $tocContent.html().trim().length > 0;
+      display = sidebarCouldDisplay && hasTOC;
+    }
+    return display;
+  },
+
+  toggleSidebar: function() {
     if (!this.isDesktop() || this.isPisces() || this.isGemini()) {
       return;
     }

From ffcb1a5d03a3d7345674ba413c278bec9eb25b1f Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 2 Aug 2019 23:17:00 +0800
Subject: [PATCH 15/30] Update

---
 source/js/motion.js       |  4 +---
 source/js/post-details.js |  2 +-
 source/js/utils.js        | 14 ++++++--------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/source/js/motion.js b/source/js/motion.js
index cd0f49d430..2cd9f15556 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -179,9 +179,7 @@ NexT.motion.middleWares = {
   },
 
   sidebar: function(integrator) {
-    if (NexT.utils.isSidebarCouldDisplay()) {
-      NexT.utils.toggleSidebar();
-    }
+    NexT.utils.toggleSidebar();
     integrator.next();
   }
 };
diff --git a/source/js/post-details.js b/source/js/post-details.js
index ff3d9aa61e..3eaeb9d6b9 100644
--- a/source/js/post-details.js
+++ b/source/js/post-details.js
@@ -68,7 +68,7 @@
     }, 500);
   });
 
-  if (!CONFIG.motion.enable && NexT.utils.isSidebarCouldDisplay()) {
+  if (!CONFIG.motion.enable) {
     NexT.utils.toggleSidebar();
   }
 })();
diff --git a/source/js/utils.js b/source/js/utils.js
index 3631b722dc..cac7d6d5dd 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -291,7 +291,10 @@ NexT.utils = {
     return selector.replace(/[!"$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g, '\\$&');
   },
 
-  isSidebarCouldDisplay: function() {
+  toggleSidebar: function() {
+    if (!this.isDesktop() || this.isPisces() || this.isGemini()) {
+      return;
+    }
     // Expand sidebar on post detail page by default, when post has a toc.
     var $tocContent = $('.post-toc-content');
     var display = CONFIG.page.sidebar;
@@ -301,14 +304,9 @@ NexT.utils = {
       var hasTOC = $tocContent.length > 0 && $tocContent.html().trim().length > 0;
       display = sidebarCouldDisplay && hasTOC;
     }
-    return display;
-  },
-
-  toggleSidebar: function() {
-    if (!this.isDesktop() || this.isPisces() || this.isGemini()) {
-      return;
+    if (display) {
+      $('.sidebar-toggle').trigger('click');
     }
-    $('.sidebar-toggle').trigger('click');
   },
 
   isMuse: function() {

From 033b74c2d08934a09b0040da4e697d733bea2137 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 00:32:01 +0800
Subject: [PATCH 16/30] Only refresh sidebar-inner

---
 layout/_layout.swig       | 12 +++++++++++-
 source/js/schemes/muse.js |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 0a0978f94f..3707eafdc5 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -117,7 +117,8 @@
         'title',
         'meta[name=description]',
         '#page-configurations',
-        '#main',
+        '.content-wrap',
+        '.sidebar-inner',
         '#bodyend-pjax'
       ],
       cacheBust: false,
@@ -140,6 +141,15 @@
         .add(NexT.motion.middleWares.sidebar)
         .bootstrap();
     });
+    $(document).on('DOMContentLoaded', function() {
+      console.log('DOMContentLoaded')
+    });
+    $(document).ready(function() {
+      console.log('Ready')
+    });
+    $(document).on('pjax:success', function() {
+      console.log('PJAX')
+    });
     </script>
   {%- endif %}
 </body>
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index fe7166fb96..ff7043b9a8 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).on('DOMContentLoaded pjax:success', function() {
+$(document).on('DOMContentLoaded', function() {
 
   var sidebarToggleLines = {
     lines: [],

From 13aa6085c77b8dad5a207415a6b53f370401cb9c Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 01:32:57 +0800
Subject: [PATCH 17/30] Sidebar motion

---
 layout/_layout.swig | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 3707eafdc5..e341406649 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -117,20 +117,21 @@
         'title',
         'meta[name=description]',
         '#page-configurations',
-        '.content-wrap',
-        '.sidebar-inner',
         '#bodyend-pjax'
       ],
+      switches: {
+        '.content-wrap': Pjax.switches.innerHTML,
+        '.sidebar-inner': Pjax.switches.innerHTML
+      },
       cacheBust: false,
       analytics: false
     });
     $(document).on('pjax:send', function() {
-      if ($('.sidebar-active').length > 0) {
-        NexT.utils.toggleSidebar();
-      }
-    })
+      $('.sidebar-inner').fadeOut();
+    });
     $(document).on('pjax:success', function() {
-      $('.menu-item').css("opacity", 1);
+      $('.motion-element').css("opacity", 1);
+      $('.sidebar-inner').stop().fadeIn();
       $('script[pjax]').each(function(i, o) {
         $(o).parent().append($(o).remove());
       });
@@ -141,15 +142,6 @@
         .add(NexT.motion.middleWares.sidebar)
         .bootstrap();
     });
-    $(document).on('DOMContentLoaded', function() {
-      console.log('DOMContentLoaded')
-    });
-    $(document).ready(function() {
-      console.log('Ready')
-    });
-    $(document).on('pjax:success', function() {
-      console.log('PJAX')
-    });
     </script>
   {%- endif %}
 </body>

From 8e542fb55895cf0ddf17805b764b02da1558bfd3 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 01:36:44 +0800
Subject: [PATCH 18/30] Disqus

---
 layout/_third-party/comments/disqus.swig | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/layout/_third-party/comments/disqus.swig b/layout/_third-party/comments/disqus.swig
index 98f59d4fd5..b7d8e97ab7 100644
--- a/layout/_third-party/comments/disqus.swig
+++ b/layout/_third-party/comments/disqus.swig
@@ -21,10 +21,17 @@
     {% endif -%}
   };
   function loadComments() {
-    var d = document, s = d.createElement('script');
-    s.src = 'https://{{ theme.disqus.shortname }}.disqus.com/embed.js';
-    s.setAttribute('data-timestamp', '' + +new Date());
-    (d.head || d.body).appendChild(s);
+    if (!window.DISQUS) {
+      var d = document, s = d.createElement('script');
+      s.src = 'https://{{ theme.disqus.shortname }}.disqus.com/embed.js';
+      s.setAttribute('data-timestamp', '' + +new Date());
+      (d.head || d.body).appendChild(s);
+    } else {
+      DISQUS.reset({
+        reload: true,
+        config: disqus_config
+      });
+    }
   }
   {%- if theme.disqus.lazyload %}
     $(function() {

From b4ed9ed8cd35d21da29bd4d8b5bda6a67f7d9911 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 01:52:03 +0800
Subject: [PATCH 19/30] Update

---
 layout/_layout.swig         | 33 +--------------------------------
 layout/_partials/pjax.swig  | 32 ++++++++++++++++++++++++++++++++
 source/js/schemes/pisces.js |  2 +-
 3 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 layout/_partials/pjax.swig

diff --git a/layout/_layout.swig b/layout/_layout.swig
index e341406649..20f9d25900 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -111,38 +111,7 @@
 
   {%- if theme.pjax %}
     </div>
-    <script>
-    var pjax = new Pjax({
-      selectors: [
-        'title',
-        'meta[name=description]',
-        '#page-configurations',
-        '#bodyend-pjax'
-      ],
-      switches: {
-        '.content-wrap': Pjax.switches.innerHTML,
-        '.sidebar-inner': Pjax.switches.innerHTML
-      },
-      cacheBust: false,
-      analytics: false
-    });
-    $(document).on('pjax:send', function() {
-      $('.sidebar-inner').fadeOut();
-    });
-    $(document).on('pjax:success', function() {
-      $('.motion-element').css("opacity", 1);
-      $('.sidebar-inner').stop().fadeIn();
-      $('script[pjax]').each(function(i, o) {
-        $(o).parent().append($(o).remove());
-      });
-      // Define Motion Sequence & Bootstrap Motion.
-      CONFIG.motion.enable && NexT.motion.integrator
-        .init()
-        .add(NexT.motion.middleWares.postList)
-        .add(NexT.motion.middleWares.sidebar)
-        .bootstrap();
-    });
-    </script>
+    {% include '_partials/pjax.swig' %}
   {%- endif %}
 </body>
 </html>
diff --git a/layout/_partials/pjax.swig b/layout/_partials/pjax.swig
new file mode 100644
index 0000000000..0a34efdabc
--- /dev/null
+++ b/layout/_partials/pjax.swig
@@ -0,0 +1,32 @@
+<script>
+var pjax = new Pjax({
+  selectors: [
+    'title',
+    'meta[name=description]',
+    '#page-configurations',
+    '.content-wrap',
+    '#bodyend-pjax'
+  ],
+  switches: {
+    '.sidebar-inner': Pjax.switches.innerHTML
+  },
+  cacheBust: false,
+  analytics: false
+});
+$(document).on('pjax:send', function() {
+  $('.sidebar-inner').fadeOut();
+});
+$(document).on('pjax:success', function() {
+  $('.motion-element').css("opacity", 1);
+  $('.sidebar-inner').stop().fadeIn();
+  $('script[pjax]').each(function(i, o) {
+    $(o).parent().append($(o).remove());
+  });
+  // Define Motion Sequence & Bootstrap Motion.
+  CONFIG.motion.enable && NexT.motion.integrator
+    .init()
+    .add(NexT.motion.middleWares.postList)
+    .add(NexT.motion.middleWares.sidebar)
+    .bootstrap();
+});
+</script>
diff --git a/source/js/schemes/pisces.js b/source/js/schemes/pisces.js
index 258778afdb..57f629396c 100644
--- a/source/js/schemes/pisces.js
+++ b/source/js/schemes/pisces.js
@@ -1,6 +1,6 @@
 /* global NexT, CONFIG */
 
-$(document).on('DOMContentLoaded pjax:success', function() {
+$(document).on('DOMContentLoaded', function() {
 
   var sidebarInner = $('.sidebar-inner');
   var sidebarOffset = CONFIG.sidebar.offset || 12;

From 48014ccd3d13c851adf28b7e28ead75c0fe8bb7c Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 11:30:10 +0800
Subject: [PATCH 20/30] Update

---
 layout/_layout.swig                    | 1 +
 layout/_third-party/facebook-sdk.swig  | 2 +-
 layout/_third-party/index.swig         | 1 -
 layout/_third-party/vkontakte-api.swig | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 20f9d25900..dfd0ff6d26 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -102,6 +102,7 @@
 
   {% include '_third-party/math/index.swig' %}
   {% include '_third-party/quicklink.swig' %}
+  {% include '_third-party/vkontakte-api.swig' %}
 
   {% block script_extra %}{% endblock %}
 
diff --git a/layout/_third-party/facebook-sdk.swig b/layout/_third-party/facebook-sdk.swig
index 1c8d87a391..5deabf0bf4 100644
--- a/layout/_third-party/facebook-sdk.swig
+++ b/layout/_third-party/facebook-sdk.swig
@@ -1,5 +1,5 @@
 {%- if theme.facebook_sdk.enable %}
-  <script{{ pjax }}>
+  <script>
     window.fbAsyncInit = function() {
       FB.init({
         appId  : '{{ theme.facebook_sdk.app_id }}',
diff --git a/layout/_third-party/index.swig b/layout/_third-party/index.swig
index b5dbec00ff..b72ecd7c76 100644
--- a/layout/_third-party/index.swig
+++ b/layout/_third-party/index.swig
@@ -3,7 +3,6 @@
 
 {% include 'analytics/analytics-with-jquery.swig' %}
 {% include 'facebook-sdk.swig' %}
-{% include 'vkontakte-api.swig' %}
 {% include 'rating.swig' %}
 
 {% include 'search/index.swig' %}
diff --git a/layout/_third-party/vkontakte-api.swig b/layout/_third-party/vkontakte-api.swig
index 26232eaf2f..a566d6f26b 100644
--- a/layout/_third-party/vkontakte-api.swig
+++ b/layout/_third-party/vkontakte-api.swig
@@ -1,6 +1,6 @@
 {%- if theme.vkontakte_api.enable %}
   <div id="vk_api_transport"></div>
-  <script{{ pjax }}>
+  <script>
     window.vkAsyncInit = function() {
       VK.init({
         apiId: {{ theme.vkontakte_api.app_id }}

From 4186dcd7d89a41ec24bda761da320b238a14fc58 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 14:13:54 +0800
Subject: [PATCH 21/30] Fix

---
 layout/_layout.swig        | 2 +-
 layout/_partials/pjax.swig | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index dfd0ff6d26..965c9b1ca7 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -97,7 +97,7 @@
   {% include '_third-party/index.swig' %}
 
   {%- if theme.pjax %}
-    <div id="bodyend-pjax">
+    <div id="pjax">
   {%- endif %}
 
   {% include '_third-party/math/index.swig' %}
diff --git a/layout/_partials/pjax.swig b/layout/_partials/pjax.swig
index 0a34efdabc..003d078441 100644
--- a/layout/_partials/pjax.swig
+++ b/layout/_partials/pjax.swig
@@ -5,7 +5,8 @@ var pjax = new Pjax({
     'meta[name=description]',
     '#page-configurations',
     '.content-wrap',
-    '#bodyend-pjax'
+    '.sidebar-inner',
+    '#pjax'
   ],
   switches: {
     '.sidebar-inner': Pjax.switches.innerHTML
@@ -19,7 +20,7 @@ $(document).on('pjax:send', function() {
 $(document).on('pjax:success', function() {
   $('.motion-element').css("opacity", 1);
   $('.sidebar-inner').stop().fadeIn();
-  $('script[pjax]').each(function(i, o) {
+  $('script[pjax], script#page-configurations, #pjax script').each(function(i, o) {
     $(o).parent().append($(o).remove());
   });
   // Define Motion Sequence & Bootstrap Motion.

From 0ae6102f2cf731269185633b3980dc33c9200cd5 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 16:35:37 +0800
Subject: [PATCH 22/30] Fix

---
 layout/_partials/pjax.swig |  4 +---
 source/js/motion.js        |  2 +-
 source/js/post-details.js  |  2 +-
 source/js/schemes/muse.js  | 32 +++++++++++++++-----------------
 source/js/utils.js         |  4 ++--
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/layout/_partials/pjax.swig b/layout/_partials/pjax.swig
index 003d078441..a0115a3b28 100644
--- a/layout/_partials/pjax.swig
+++ b/layout/_partials/pjax.swig
@@ -2,7 +2,6 @@
 var pjax = new Pjax({
   selectors: [
     'title',
-    'meta[name=description]',
     '#page-configurations',
     '.content-wrap',
     '.sidebar-inner',
@@ -15,10 +14,9 @@ var pjax = new Pjax({
   analytics: false
 });
 $(document).on('pjax:send', function() {
-  $('.sidebar-inner').fadeOut();
+  $('.sidebar-inner').stop().fadeOut();
 });
 $(document).on('pjax:success', function() {
-  $('.motion-element').css("opacity", 1);
   $('.sidebar-inner').stop().fadeIn();
   $('script[pjax], script#page-configurations, #pjax script').each(function(i, o) {
     $(o).parent().append($(o).remove());
diff --git a/source/js/motion.js b/source/js/motion.js
index 2cd9f15556..a950757829 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -179,7 +179,7 @@ NexT.motion.middleWares = {
   },
 
   sidebar: function(integrator) {
-    NexT.utils.toggleSidebar();
+    NexT.utils.updateSidebarPosition();
     integrator.next();
   }
 };
diff --git a/source/js/post-details.js b/source/js/post-details.js
index 3eaeb9d6b9..a5306a833b 100644
--- a/source/js/post-details.js
+++ b/source/js/post-details.js
@@ -69,6 +69,6 @@
   });
 
   if (!CONFIG.motion.enable) {
-    NexT.utils.toggleSidebar();
+    NexT.utils.updateSidebarPosition();
   }
 })();
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index ff7043b9a8..e3a38cca70 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -105,7 +105,8 @@ $(document).on('DOMContentLoaded', function() {
       $('body')
         .on('mousedown', this.mousedownHandler.bind(this))
         .on('mouseup', this.mouseupHandler.bind(this));
-      $('#sidebar-dimmer').on('click', this.clickHandler.bind(this));
+      $('#sidebar-dimmer')
+        .on('click', this.clickHandler.bind(this));
       $('.sidebar-toggle')
         .on('click', this.clickHandler.bind(this))
         .on('mouseenter', this.mouseEnterHandler.bind(this))
@@ -116,14 +117,9 @@ $(document).on('DOMContentLoaded', function() {
         .on('touchmove', function(e) {
           e.preventDefault();
         });
-
       $(document)
-        .on('sidebar.isShowing', function() {
-          NexT.utils.isDesktop() && $('body').stop().animate(
-            isRight ? {'padding-right': SIDEBAR_WIDTH} : {'padding-left': SIDEBAR_WIDTH},
-            SIDEBAR_DISPLAY_DURATION
-          );
-        });
+        .on('sidebar:show', this.showSidebar.bind(this))
+        .on('sidebar:hide', this.hideSidebar.bind(this));
     },
     mousedownHandler: function(e) {
       mousePos.X = e.pageX;
@@ -132,14 +128,13 @@ $(document).on('DOMContentLoaded', function() {
     mouseupHandler: function(e) {
       var deltaX = e.pageX - mousePos.X;
       var deltaY = e.pageY - mousePos.Y;
-      var clickBlankPart = Math.sqrt((deltaX * deltaX) + (deltaY * deltaY)) < 20 && $(e.target).is('.main');
-      if (this.isSidebarVisible && (clickBlankPart || $(e.target).is('img.medium-zoom-image, .fancybox img'))) {
-        this.clickHandler();
+      var clickingBlankPart = Math.sqrt((deltaX * deltaX) + (deltaY * deltaY)) < 20 && $(e.target).is('.main');
+      if (this.isSidebarVisible && (clickingBlankPart || $(e.target).is('img.medium-zoom-image, .fancybox img'))) {
+        this.hideSidebar();
       }
     },
     clickHandler: function() {
       this.isSidebarVisible ? this.hideSidebar() : this.showSidebar();
-      this.isSidebarVisible = !this.isSidebarVisible;
     },
     mouseEnterHandler: function() {
       if (!this.isSidebarVisible) {
@@ -158,13 +153,14 @@ $(document).on('DOMContentLoaded', function() {
     touchendHandler: function(e) {
       var deltaX = e.originalEvent.changedTouches[0].clientX - touchPos.X;
       var deltaY = e.originalEvent.changedTouches[0].clientY - touchPos.Y;
-      if (Math.abs(deltaY) < 20 && ((deltaX > 30 && isRight) || (deltaX < -30 && !isRight))) {
-        this.clickHandler();
+      var effectiveSliding = Math.abs(deltaY) < 20 && ((deltaX > 30 && isRight) || (deltaX < -30 && !isRight));
+      if (this.isSidebarVisible && effectiveSliding) {
+        this.hideSidebar();
       }
     },
     showSidebar: function() {
+      this.isSidebarVisible = !this.isSidebarVisible;
       var self = this;
-      sidebarToggleLines.close();
 
       if ($.isFunction($('html').velocity)) {
         this.sidebarEl.stop().velocity({
@@ -201,14 +197,16 @@ $(document).on('DOMContentLoaded', function() {
         });
       }
 
-      this.sidebarEl.trigger('sidebar.isShowing');
+      sidebarToggleLines.close();
+      NexT.utils.isDesktop() && $('body').stop().animate(isRight ? {'padding-right': SIDEBAR_WIDTH} : {'padding-left': SIDEBAR_WIDTH}, SIDEBAR_DISPLAY_DURATION);
     },
     hideSidebar: function() {
-      NexT.utils.isDesktop() && $('body').stop().animate(isRight ? {'padding-right': 0} : {'padding-left': 0});
+      this.isSidebarVisible = !this.isSidebarVisible;
       this.sidebarEl.find('.motion-element').hide();
       this.sidebarEl.stop().animate({width: 0, display: 'none'}).removeClass('sidebar-active');
 
       sidebarToggleLines.init();
+      NexT.utils.isDesktop() && $('body').stop().animate(isRight ? {'padding-right': 0} : {'padding-left': 0});
 
       // Prevent adding TOC to Overview if Overview was selected when close & open sidebar.
       if ($('.post-toc-wrap')) {
diff --git a/source/js/utils.js b/source/js/utils.js
index cac7d6d5dd..687d4ca49b 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -291,7 +291,7 @@ NexT.utils = {
     return selector.replace(/[!"$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g, '\\$&');
   },
 
-  toggleSidebar: function() {
+  updateSidebarPosition: function() {
     if (!this.isDesktop() || this.isPisces() || this.isGemini()) {
       return;
     }
@@ -305,7 +305,7 @@ NexT.utils = {
       display = sidebarCouldDisplay && hasTOC;
     }
     if (display) {
-      $('.sidebar-toggle').trigger('click');
+      $(document).trigger('sidebar:show');
     }
   },
 

From 7ff6b99a938be6f9f3b578ae8e78478be0b5ee35 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 16:47:34 +0800
Subject: [PATCH 23/30] Always

---
 source/js/utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/js/utils.js b/source/js/utils.js
index 687d4ca49b..f0bf063fe1 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -300,9 +300,8 @@ NexT.utils = {
     var display = CONFIG.page.sidebar;
     if (typeof display !== 'boolean') {
       // There's no definition sidebar in the page front-matter
-      var sidebarCouldDisplay = CONFIG.sidebar.display === 'post' || CONFIG.sidebar.display === 'always';
       var hasTOC = $tocContent.length > 0 && $tocContent.html().trim().length > 0;
-      display = sidebarCouldDisplay && hasTOC;
+      display = CONFIG.sidebar.display === 'always' || (CONFIG.sidebar.display === 'post' && hasTOC);
     }
     if (display) {
       $(document).trigger('sidebar:show');

From 831f2c34924190a6c508437fe503c37c200c7369 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 17:22:42 +0800
Subject: [PATCH 24/30] Fix toggle

---
 layout/_third-party/analytics/firestore.swig | 55 +++++++++-----------
 source/js/schemes/muse.js                    |  4 +-
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/layout/_third-party/analytics/firestore.swig b/layout/_third-party/analytics/firestore.swig
index 3e1bac0ec9..667049b7af 100644
--- a/layout/_third-party/analytics/firestore.swig
+++ b/layout/_third-party/analytics/firestore.swig
@@ -16,35 +16,33 @@
         //increaseCount will be false when not in article page
 
         return doc.get().then(function (d) {
-          var count
+          var count;
           if (!d.exists) { //has no data, initialize count
             if (increaseCount) {
               doc.set({
                 count: 1
-              })
-              count = 1
+              });
+              count = 1;
+            } else {
+              count = 0;
             }
-            else {
-              count = 0
-            }
-          }
-          else { //has data
-            count = d.data().count
+          } else { //has data
+            count = d.data().count;
             if (increaseCount) {
               if (!(window.localStorage && window.localStorage.getItem(title))) { //if first view this article
                 doc.set({ //increase count
                   count: count + 1
-                })
-                count++
+                });
+                count++;
               }
             }
           }
           if (window.localStorage && increaseCount) { //mark as visited
-            localStorage.setItem(title, true)
+            localStorage.setItem(title, true);
           }
 
-          return count
-        })
+          return count;
+        });
       }
 
       function appendCountTo(el) {
@@ -63,33 +61,32 @@
         }
       }
 
-      var db = firebase.firestore()
-      var articles = db.collection('{{ theme.firestore.collection }}')
+      var db = firebase.firestore();
+      var articles = db.collection('{{ theme.firestore.collection }}');
 
       if (CONFIG.page.isPost) { //is article page
-        var title = '{{ page.title }}'
-        var doc = articles.doc(title)
+        var title = '{{ page.title }}';
+        var doc = articles.doc(title);
 
-        getCount(doc, true).then(appendCountTo($('.post-meta')))
-      }
-      else if (CONFIG.page.isHome) { //is index page
-        var titles = [] //array to titles
+        getCount(doc, true).then(appendCountTo($('.post-meta')));
+      } else if (CONFIG.page.isHome) { //is index page
+        var titles = []; //array to titles
 
         var postsstr = '{%- for post in page.posts %}titles.push("{{ post.title }}");{%- endfor %}' //if you have a better way to get titles of posts, please change it
-        eval(postsstr)
+        eval(postsstr);
 
         var promises = titles.map(function (title) {
-          return articles.doc(title)
+          return articles.doc(title);
         }).map(function (doc) {
-          return getCount(doc)
-        })
+          return getCount(doc);
+        });
         Promise.all(promises).then(function (counts) {
           var metas = $('.post-meta')
           counts.forEach(function (val, idx) {
             appendCountTo(metas[idx])(val)
-          })
-        })
+          });
+        });
       }
-    })()
+    })();
   </script>
 {%- endif %}
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index e3a38cca70..dcb19a127d 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -159,7 +159,7 @@ $(document).on('DOMContentLoaded', function() {
       }
     },
     showSidebar: function() {
-      this.isSidebarVisible = !this.isSidebarVisible;
+      this.isSidebarVisible = true;
       var self = this;
 
       if ($.isFunction($('html').velocity)) {
@@ -201,7 +201,7 @@ $(document).on('DOMContentLoaded', function() {
       NexT.utils.isDesktop() && $('body').stop().animate(isRight ? {'padding-right': SIDEBAR_WIDTH} : {'padding-left': SIDEBAR_WIDTH}, SIDEBAR_DISPLAY_DURATION);
     },
     hideSidebar: function() {
-      this.isSidebarVisible = !this.isSidebarVisible;
+      this.isSidebarVisible = false;
       this.sidebarEl.find('.motion-element').hide();
       this.sidebarEl.stop().animate({width: 0, display: 'none'}).removeClass('sidebar-active');
 

From 2bcdef94a7d960810726cdd7dafdc824c1822344 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 20:54:50 +0800
Subject: [PATCH 25/30] Update

---
 source/js/next-boot.js |  2 +-
 source/js/utils.js     | 28 +++++++++-------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/source/js/next-boot.js b/source/js/next-boot.js
index 72bdfe9615..66751cb676 100644
--- a/source/js/next-boot.js
+++ b/source/js/next-boot.js
@@ -3,6 +3,7 @@
 $(document).on('DOMContentLoaded', function() {
 
   CONFIG.back2top.enable && NexT.utils.registerBackToTop();
+  CONFIG.tabs && NexT.utils.registerTabsTag();
   NexT.utils.registerCanIUseTag();
 
   // Mobile top menu bar.
@@ -40,7 +41,6 @@ $(document).on('DOMContentLoaded pjax:success', function() {
 
   CONFIG.save_scroll && NexT.utils.saveScroll();
   CONFIG.copycode.enable && NexT.utils.registerCopyCode();
-  CONFIG.tabs && NexT.utils.registerTabsTag();
   NexT.utils.registerActiveMenuItem();
   NexT.utils.embeddedVideoTransformer();
 
diff --git a/source/js/utils.js b/source/js/utils.js
index 3ce65de6f7..cc3f466f7a 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -119,7 +119,8 @@ NexT.utils = {
     var THRESHOLD = 50;
     var $top = $('.back-to-top');
 
-    function initBackToTop() {
+    // For init back to top in sidebar if page was scrolled after page refresh.
+    $(window).on('load scroll', function() {
       $top.toggleClass('back-to-top-on', window.pageYOffset > THRESHOLD);
 
       var scrollTop = $(window).scrollTop();
@@ -128,15 +129,6 @@ NexT.utils = {
       var scrollPercentRounded = Math.round(scrollPercent * 100);
       var scrollPercentMaxed = Math.min(scrollPercentRounded, 100);
       $('#scrollpercent > span').html(scrollPercentMaxed);
-    }
-
-    // For init back to top in sidebar if page was scrolled after page refresh.
-    $(window).on('load', function() {
-      initBackToTop();
-    });
-
-    $(window).on('scroll', function() {
-      initBackToTop();
     });
 
     $top.on('click', function() {
@@ -151,15 +143,13 @@ NexT.utils = {
     var tNav = '.tabs ul.nav-tabs ';
 
     // Binding `nav-tabs` & `tab-content` by real time permalink changing.
-    $(document).on('DOMContentLoaded pjax:success', function() {
-      $(window).bind('hashchange', function() {
-        var tHash = location.hash;
-        if (tHash !== '' && !tHash.match(/%\S{2}/)) {
-          $(`${tNav}li:has(a[href="${tHash}"])`).addClass('active').siblings().removeClass('active');
-          $(tHash).addClass('active').siblings().removeClass('active');
-        }
-      }).trigger('hashchange');
-    });
+    $(window).bind('hashchange', function() {
+      var tHash = location.hash;
+      if (tHash !== '' && !tHash.match(/%\S{2}/)) {
+        $(`${tNav}li:has(a[href="${tHash}"])`).addClass('active').siblings().removeClass('active');
+        $(tHash).addClass('active').siblings().removeClass('active');
+      }
+    }).trigger('hashchange');
 
     $(tNav + '.tab').on('click', function(href) {
       href.preventDefault();

From cdc7bdbecc49a4f7d8b5a9a3486422f851495ddb Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sat, 3 Aug 2019 23:51:59 +0800
Subject: [PATCH 26/30] Update

---
 layout/_partials/pjax.swig  | 20 ++++++++------
 source/js/motion.js         | 54 ++++++++++++++++++-------------------
 source/js/next-boot.js      | 17 ++++++++++--
 source/js/post-details.js   |  4 ---
 source/js/schemes/pisces.js |  1 -
 source/js/utils.js          | 38 +-------------------------
 6 files changed, 54 insertions(+), 80 deletions(-)

diff --git a/layout/_partials/pjax.swig b/layout/_partials/pjax.swig
index a0115a3b28..a301256206 100644
--- a/layout/_partials/pjax.swig
+++ b/layout/_partials/pjax.swig
@@ -10,22 +10,26 @@ var pjax = new Pjax({
   switches: {
     '.sidebar-inner': Pjax.switches.innerHTML
   },
+  analytics: false,
   cacheBust: false,
-  analytics: false
+  scrollTo: !CONFIG.save_scroll
 });
 $(document).on('pjax:send', function() {
-  $('.sidebar-inner').stop().fadeOut();
+  $('.sidebar-inner').stop().fadeTo('slow', 0);
+  CONFIG.save_scroll && clearInterval(NexT.utils.saveScrollTimer);
 });
 $(document).on('pjax:success', function() {
-  $('.sidebar-inner').stop().fadeIn();
+  $('.sidebar-inner .motion-element').css('opacity', 1);
+  $('.sidebar-inner').stop().fadeTo('slow', 1);
   $('script[pjax], script#page-configurations, #pjax script').each(function(i, o) {
     $(o).parent().append($(o).remove());
   });
   // Define Motion Sequence & Bootstrap Motion.
-  CONFIG.motion.enable && NexT.motion.integrator
-    .init()
-    .add(NexT.motion.middleWares.postList)
-    .add(NexT.motion.middleWares.sidebar)
-    .bootstrap();
+  if (CONFIG.motion.enable) {
+    NexT.motion.integrator
+      .init()
+      .add(NexT.motion.middleWares.postList)
+      .bootstrap();
+  }
 });
 </script>
diff --git a/source/js/motion.js b/source/js/motion.js
index a950757829..aecdb55d72 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -93,10 +93,6 @@ NexT.motion.middleWares = {
 
     (NexT.utils.isPisces() || NexT.utils.isGemini()) && hasElement($image) && pushImageToSequence();
 
-    if (CONFIG.motion.async) {
-      integrator.next();
-    }
-
     if (sequence.length > 0) {
       sequence[sequence.length - 1].o.complete = function() {
         integrator.next();
@@ -107,13 +103,13 @@ NexT.motion.middleWares = {
     } else {
       integrator.next();
     }
-  },
-
-  menu: function(integrator) {
 
     if (CONFIG.motion.async) {
       integrator.next();
     }
+  },
+
+  menu: function(integrator) {
 
     $('.menu-item').velocity('transition.slideDownIn', {
       display : null,
@@ -122,11 +118,14 @@ NexT.motion.middleWares = {
         integrator.next();
       }
     });
+
+    if (CONFIG.motion.async) {
+      integrator.next();
+    }
   },
 
   postList: function(integrator) {
 
-    //var $post = $('.post');
     var $postBlock = $('.post-block, .pagination, .comments');
     var $postBlockTransition = CONFIG.motion.transition.post_block;
     var $postHeader = $('.post-header');
@@ -135,24 +134,17 @@ NexT.motion.middleWares = {
     var $postBodyTransition = CONFIG.motion.transition.post_body;
     var $collHeader = $('.collection-title, .archive-year');
     var $collHeaderTransition = CONFIG.motion.transition.coll_header;
-    var $sidebarAffix = $('.sidebar-inner');
-    var $sidebarAffixTransition = CONFIG.motion.transition.sidebar;
     var hasPost = $postBlock.length > 0;
 
-    function postMotion() {
+    if (hasPost) {
       var postMotionOptions = window.postMotionOptions || {
-        stagger: 100,
-        drag   : true
-      };
-      postMotionOptions.complete = function() {
-        // After motion complete need to remove transform from sidebar to let affix work on Pisces | Gemini.
-        if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
-          $sidebarAffix.css({ 'transform': 'initial' });
+        stagger : 100,
+        drag    : true,
+        complete: function() {
+          integrator.next();
         }
-        integrator.next();
       };
 
-      //$post.velocity('transition.slideDownIn', postMotionOptions);
       if (CONFIG.motion.transition.post_block) {
         $postBlock.velocity('transition.' + $postBlockTransition, postMotionOptions);
       }
@@ -165,21 +157,27 @@ NexT.motion.middleWares = {
       if (CONFIG.motion.transition.coll_header) {
         $collHeader.velocity('transition.' + $collHeaderTransition, postMotionOptions);
       }
-      // Only for Pisces | Gemini.
-      if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
-        $sidebarAffix.velocity('transition.' + $sidebarAffixTransition, postMotionOptions);
-      }
     }
-
-    hasPost ? postMotion() : integrator.next();
-
-    if (CONFIG.motion.async) {
+    if (NexT.utils.isPisces() || NexT.utils.isGemini()) {
       integrator.next();
     }
   },
 
   sidebar: function(integrator) {
     NexT.utils.updateSidebarPosition();
+    var $sidebarAffix = $('.sidebar-inner');
+    var $sidebarAffixTransition = CONFIG.motion.transition.sidebar;
+    // Only for Pisces | Gemini.
+    if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) {
+      $sidebarAffix.velocity('transition.' + $sidebarAffixTransition, {
+        display : null,
+        duration: 200,
+        complete: function() {
+          // After motion complete need to remove transform from sidebar to let affix work on Pisces | Gemini.
+          $sidebarAffix.css({ 'transform': 'initial' });
+        }
+      });
+    }
     integrator.next();
   }
 };
diff --git a/source/js/next-boot.js b/source/js/next-boot.js
index 66751cb676..8427b2b4dd 100644
--- a/source/js/next-boot.js
+++ b/source/js/next-boot.js
@@ -3,7 +3,6 @@
 $(document).on('DOMContentLoaded', function() {
 
   CONFIG.back2top.enable && NexT.utils.registerBackToTop();
-  CONFIG.tabs && NexT.utils.registerTabsTag();
   NexT.utils.registerCanIUseTag();
 
   // Mobile top menu bar.
@@ -30,6 +29,16 @@ $(document).on('DOMContentLoaded', function() {
 
 $(document).on('DOMContentLoaded pjax:success', function() {
 
+  if (CONFIG.save_scroll) {
+    // Read position from localStorage
+    var value = localStorage.getItem('scroll' + location.pathname);
+    $('html, body').animate({ scrollTop: value || 0 });
+    // Write position in localStorage
+    NexT.utils.saveScrollTimer = setInterval(function() {
+      localStorage.setItem('scroll' + location.pathname, $(window).scrollTop());
+    }, 1000);
+  }
+
   /**
    * Register JS handlers by condition option.
    * Need to add config option in Front-End at 'layout/_partials/head.swig' file.
@@ -39,8 +48,8 @@ $(document).on('DOMContentLoaded pjax:success', 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.tabs && NexT.utils.registerTabsTag();
   NexT.utils.registerActiveMenuItem();
   NexT.utils.embeddedVideoTransformer();
 
@@ -84,4 +93,8 @@ $(document).on('DOMContentLoaded pjax:success', function() {
     $('table').not('.gist table').wrap('<div class="table-container"></div>');
   }
   wrapTable();
+
+  if (!CONFIG.motion.enable) {
+    NexT.utils.updateSidebarPosition();
+  }
 });
diff --git a/source/js/post-details.js b/source/js/post-details.js
index a5306a833b..bea806ffa6 100644
--- a/source/js/post-details.js
+++ b/source/js/post-details.js
@@ -67,8 +67,4 @@
       scrollTop: offset
     }, 500);
   });
-
-  if (!CONFIG.motion.enable) {
-    NexT.utils.updateSidebarPosition();
-  }
 })();
diff --git a/source/js/schemes/pisces.js b/source/js/schemes/pisces.js
index 57f629396c..26644ebd7e 100644
--- a/source/js/schemes/pisces.js
+++ b/source/js/schemes/pisces.js
@@ -27,7 +27,6 @@ $(document).on('DOMContentLoaded', function() {
         bottom: footerOffset
       }
     });
-    sidebarInner.affix('checkPosition');
 
     $('#sidebar').css({ 'margin-top': headerOffset, 'margin-left': 'auto' });
   }
diff --git a/source/js/utils.js b/source/js/utils.js
index cc3f466f7a..512084ff1c 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -42,26 +42,6 @@ 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.
    */
@@ -140,31 +120,15 @@ NexT.utils = {
    * Tabs tag listener (without twitter bootstrap).
    */
   registerTabsTag: function() {
-    var tNav = '.tabs ul.nav-tabs ';
-
     // Binding `nav-tabs` & `tab-content` by real time permalink changing.
-    $(window).bind('hashchange', function() {
-      var tHash = location.hash;
-      if (tHash !== '' && !tHash.match(/%\S{2}/)) {
-        $(`${tNav}li:has(a[href="${tHash}"])`).addClass('active').siblings().removeClass('active');
-        $(tHash).addClass('active').siblings().removeClass('active');
-      }
-    }).trigger('hashchange');
-
-    $(tNav + '.tab').on('click', function(href) {
+    $('.tabs ul.nav-tabs .tab').on('click', function(href) {
       href.preventDefault();
       // Prevent selected tab to select again.
       if (!$(this).hasClass('active')) {
-
         // Add & Remove active class on `nav-tabs` & `tab-content`.
         $(this).addClass('active').siblings().removeClass('active');
         var tActive = $(this).find('a').attr('href');
         $(tActive).addClass('active').siblings().removeClass('active');
-
-        // Clear location hash in browser if #permalink exists.
-        if (location.hash !== '') {
-          history.pushState('', document.title, window.location.pathname + window.location.search);
-        }
       }
     });
   },

From 6ca4dba77ef7c22750f0a15340d0d59850929928 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sun, 4 Aug 2019 00:30:55 +0800
Subject: [PATCH 27/30] Motion

---
 layout/_partials/pjax.swig |  7 ++++---
 source/js/next-boot.js     | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/layout/_partials/pjax.swig b/layout/_partials/pjax.swig
index a301256206..e385c5bd71 100644
--- a/layout/_partials/pjax.swig
+++ b/layout/_partials/pjax.swig
@@ -15,12 +15,10 @@ var pjax = new Pjax({
   scrollTo: !CONFIG.save_scroll
 });
 $(document).on('pjax:send', function() {
-  $('.sidebar-inner').stop().fadeTo('slow', 0);
+  $('.sidebar-inner').stop().fadeTo('fast', 0);
   CONFIG.save_scroll && clearInterval(NexT.utils.saveScrollTimer);
 });
 $(document).on('pjax:success', function() {
-  $('.sidebar-inner .motion-element').css('opacity', 1);
-  $('.sidebar-inner').stop().fadeTo('slow', 1);
   $('script[pjax], script#page-configurations, #pjax script').each(function(i, o) {
     $(o).parent().append($(o).remove());
   });
@@ -31,5 +29,8 @@ $(document).on('pjax:success', function() {
       .add(NexT.motion.middleWares.postList)
       .bootstrap();
   }
+  $('.sidebar-inner .motion-element').css('opacity', 1);
+  $('.sidebar-inner').fadeTo('fast', 1);
+  NexT.utils.updateSidebarPosition();
 });
 </script>
diff --git a/source/js/next-boot.js b/source/js/next-boot.js
index 8427b2b4dd..58ae2635b7 100644
--- a/source/js/next-boot.js
+++ b/source/js/next-boot.js
@@ -19,12 +19,16 @@ $(document).on('DOMContentLoaded', function() {
   });
 
   // Define Motion Sequence & Bootstrap Motion.
-  CONFIG.motion.enable && NexT.motion.integrator
-    .add(NexT.motion.middleWares.logo)
-    .add(NexT.motion.middleWares.menu)
-    .add(NexT.motion.middleWares.postList)
-    .add(NexT.motion.middleWares.sidebar)
-    .bootstrap();
+  if (CONFIG.motion.enable) {
+    NexT.motion.integrator
+      .add(NexT.motion.middleWares.logo)
+      .add(NexT.motion.middleWares.menu)
+      .add(NexT.motion.middleWares.postList)
+      .add(NexT.motion.middleWares.sidebar)
+      .bootstrap();
+  } else {
+    NexT.utils.updateSidebarPosition();
+  }
 });
 
 $(document).on('DOMContentLoaded pjax:success', function() {
@@ -93,8 +97,4 @@ $(document).on('DOMContentLoaded pjax:success', function() {
     $('table').not('.gist table').wrap('<div class="table-container"></div>');
   }
   wrapTable();
-
-  if (!CONFIG.motion.enable) {
-    NexT.utils.updateSidebarPosition();
-  }
 });

From f441289d0f068bad9211ede1f1cf01034eb8c4dd Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sun, 4 Aug 2019 00:56:08 +0800
Subject: [PATCH 28/30] Update CDN

---
 _config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.yml b/_config.yml
index 7cdaf56b6d..c16c540875 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1027,7 +1027,7 @@ vendors:
 
   # Internal version: 0.2.8
   # Example:
-  # pjax: //cdn.jsdelivr.net/npm/pjax@0/pjax.min.js
+  # pjax: //cdn.jsdelivr.net/gh/theme-next/theme-next-pjax@0/pjax.min.js
   pjax:
 
   # Internal version: 2.1.5 & 3.5.7

From 3a96474a3d88f7fdbf9d67b3bd9c47dfdc3217e5 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Sun, 4 Aug 2019 01:41:25 +0800
Subject: [PATCH 29/30] Update

---
 layout/_third-party/analytics/firestore.swig | 134 +++++++++----------
 1 file changed, 65 insertions(+), 69 deletions(-)

diff --git a/layout/_third-party/analytics/firestore.swig b/layout/_third-party/analytics/firestore.swig
index 667049b7af..0e37a5f284 100644
--- a/layout/_third-party/analytics/firestore.swig
+++ b/layout/_third-party/analytics/firestore.swig
@@ -5,88 +5,84 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.5.1/bluebird.core.min.js"></script>
   {%- endif %}
   <script{{ pjax }}>
-    (function () {
+  (function() {
 
-      firebase.initializeApp({
-        apiKey: '{{ theme.firestore.apiKey }}',
-        projectId: '{{ theme.firestore.projectId }}'
-      })
+    firebase.initializeApp({
+      apiKey: '{{ theme.firestore.apiKey }}',
+      projectId: '{{ theme.firestore.projectId }}'
+    });
 
-      function getCount(doc, increaseCount) {
-        //increaseCount will be false when not in article page
+    function getCount(doc, increaseCount) {
+      //increaseCount will be false when not in article page
 
-        return doc.get().then(function (d) {
-          var count;
-          if (!d.exists) { //has no data, initialize count
-            if (increaseCount) {
-              doc.set({
-                count: 1
+      return doc.get().then(d => {
+        var count;
+        if (!d.exists) { //has no data, initialize count
+          if (increaseCount) {
+            doc.set({
+              count: 1
+            });
+            count = 1;
+          } else {
+            count = 0;
+          }
+        } else { //has data
+          count = d.data().count;
+          if (increaseCount) {
+            if (!(window.localStorage && window.localStorage.getItem(title))) { //if first view this article
+              doc.set({ //increase count
+                count: count + 1
               });
-              count = 1;
-            } else {
-              count = 0;
-            }
-          } else { //has data
-            count = d.data().count;
-            if (increaseCount) {
-              if (!(window.localStorage && window.localStorage.getItem(title))) { //if first view this article
-                doc.set({ //increase count
-                  count: count + 1
-                });
-                count++;
-              }
+              count++;
             }
           }
-          if (window.localStorage && increaseCount) { //mark as visited
-            localStorage.setItem(title, true);
-          }
+        }
+        if (window.localStorage && increaseCount) { //mark as visited
+          localStorage.setItem(title, true);
+        }
 
-          return count;
-        });
-      }
+        return count;
+      });
+    }
 
-      function appendCountTo(el) {
-        return function (count) {
-          $(el).append(
-            $('<span>').addClass('post-meta-item')
-              .append(
-                $('<span>').addClass('post-meta-item-icon').append(
-                  $('<i>').addClass('fa fa-users')
-                )
+    function appendCountTo(el) {
+      return function(count) {
+        $(el).append(
+          $('<span>').addClass('post-meta-item')
+            .append(
+              $('<span>').addClass('post-meta-item-icon').append(
+                $('<i>').addClass('fa fa-users')
               )
-              .append(
-                $('<span>').text('{{ __("post.views")}} ' + count)
-              )
-          );
-        }
+            )
+            .append(
+              $('<span>').text('{{ __("post.views")}} ' + count)
+            )
+        );
       }
+    }
 
-      var db = firebase.firestore();
-      var articles = db.collection('{{ theme.firestore.collection }}');
-
-      if (CONFIG.page.isPost) { //is article page
-        var title = '{{ page.title }}';
-        var doc = articles.doc(title);
+    var db = firebase.firestore();
+    var articles = db.collection('{{ theme.firestore.collection }}');
 
-        getCount(doc, true).then(appendCountTo($('.post-meta')));
-      } else if (CONFIG.page.isHome) { //is index page
-        var titles = []; //array to titles
+    if (CONFIG.page.isPost) { //is article page
+      var title = $('.post-title').text().trim();
+      var doc = articles.doc(title);
 
-        var postsstr = '{%- for post in page.posts %}titles.push("{{ post.title }}");{%- endfor %}' //if you have a better way to get titles of posts, please change it
-        eval(postsstr);
-
-        var promises = titles.map(function (title) {
-          return articles.doc(title);
-        }).map(function (doc) {
-          return getCount(doc);
-        });
-        Promise.all(promises).then(function (counts) {
-          var metas = $('.post-meta')
-          counts.forEach(function (val, idx) {
-            appendCountTo(metas[idx])(val)
-          });
+      getCount(doc, true).then(appendCountTo($('.post-meta')));
+    } else if (CONFIG.page.isHome) { //is index page
+      var promises = $('.post-title').map((i, o) => {
+        var title = $(o).text().trim();
+        return articles.doc(title);
+      }).map(doc => {
+        return getCount(doc);
+      });
+      Promise.all(promises).then(counts => {
+        var metas = $('.post-meta')
+        counts.forEach((val, idx) => {
+          appendCountTo(metas[idx])(val)
         });
-      }
-    })();
+      });
+    }
+  })();
   </script>
 {%- endif %}

From 885664bb3c75d52068ea3d84c8a4714ecb35712d Mon Sep 17 00:00:00 2001
From: 1v9 <mkb@live.cn>
Date: Sun, 4 Aug 2019 01:47:40 +0800
Subject: [PATCH 30/30] last

---
 source/js/post-details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/js/post-details.js b/source/js/post-details.js
index bea806ffa6..0d28e07bc5 100644
--- a/source/js/post-details.js
+++ b/source/js/post-details.js
@@ -1,4 +1,4 @@
-/* global NexT, CONFIG */
+/* global NexT */
 
 (function() {
 
@@ -67,4 +67,4 @@
       scrollTop: offset
     }, 500);
   });
-})();
+}());