Optimize the loading of next-boot.js and some 3rd-party plugins

_config.yml

@@ -726,8 +726,8 @@ growingio_analytics: # <project_id>
 
 # Google Analytics
 google_analytics:
-  #tracking_id:
-  #localhost_ignored: true
+  tracking_id: # <app_id>
+  localhost_ignored: true
 
 # CNZZ count
 cnzz_siteid:

layout/_layout.swig

@@ -84,11 +84,8 @@
       </div>
     {% endif %}
 
-    {% if theme.add_this_id %}
-      <div>
-        {% include '_partials/share/add-this.swig' %}
-      </div>
-    {% endif %}
+    {% include '_partials/share/needsharebutton.swig' %}
+    {% include '_partials/share/add-this.swig' %}
   </div>
 
   {% include '_scripts/vendors.swig' %}
@@ -103,19 +100,8 @@
   {% include '_scripts/scroll-cookie.swig' %}
   {% include '_scripts/exturl.swig' %}
   {% include '_scripts/three.swig' %}
-  {% include '_third-party/math/index.swig' %}
-  {% include '_third-party/pangu.swig' %}
-  {% include '_third-party/quicklink.swig' %}
-  {% include '_third-party/bookmark.swig' %}
-  {% include '_third-party/schedule.swig' %}
-  {% include '_third-party/comments/index.swig' %}
-  {% include '_third-party/analytics/analytics-with-jquery.swig' %}
-  {% include '_third-party/search/index.swig' %}
-  {% include '_third-party/chat/index.swig' %}
-  {% include '_third-party/tags/index.swig' %}
-  {% include '_third-party/baidu-push.swig' %}
-  {% include '_third-party/needsharebutton.swig' %}
-  {% include '_third-party/rating.swig' %}
+
+  {% include '_third-party/index.swig' %}
 
   {% for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}

layout/_macro/post.swig

@@ -399,9 +399,7 @@
           {% endif %}
           <div class="social_share">
             {% if theme.likely.enable %}
-              <div>
-                {% include '../_partials/share/likely.swig' %}
-              </div>
+              {% include '../_partials/share/likely.swig' %}
             {% endif %}
             {% if theme.needmoreshare2.enable and theme.needmoreshare2.postbottom.enable %}
               <div id="needsharebutton-postbottom">

layout/_partials/head/head.swig

@@ -101,12 +101,13 @@
     mediumzoom: {{ theme.mediumzoom }},
     fastclick: {{ theme.fastclick }},
     lazyload: {{ theme.lazyload }},
+    pangu: {{ theme.pangu }},
     tabs: {{ theme.tabs.enable }},
     motion: {{ theme.motion | json_encode }},
     algolia: {
-      applicationID: '{{ theme.algolia.applicationID }}',
-      apiKey: '{{ theme.algolia.apiKey }}',
-      indexName: '{{ theme.algolia.indexName }}',
+      applicationID: '{{ config.algolia.applicationID }}',
+      apiKey: '{{ config.algolia.apiKey }}',
+      indexName: '{{ config.algolia.indexName }}',
       hits: {{ theme.algolia_search.hits | json_encode }},
       labels: {{ theme.algolia_search.labels | json_encode }}
     },

layout/_partials/share/add-this.swig

@@ -1,3 +1,5 @@
-<div class="addthis_inline_share_toolbox">
-  <script src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ theme.add_this_id }}" async="async"></script>
-</div>
+{% if theme.add_this_id %}
+  <div class="addthis_inline_share_toolbox">
+    <script src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ theme.add_this_id }}" async="async"></script>
+  </div>
+{% endif %}

layout/_scripts/vendors.swig

@@ -10,6 +10,14 @@
 {% set js_defer_vendors = {} %}
 {% set js_vendors.jquery = 'jquery/index.js?v=3.4.1' %}
 
+{% if theme.fancybox %}
+  {% set js_vendors.fancybox = 'fancybox/source/jquery.fancybox.pack.js' %}
+{% endif %}
+
+{% if theme.mediumzoom %}
+  {% set js_vendors.mediumzoom = 'mediumzoom/medium-zoom.min.js' %}
+{% endif %}
+
 {% if theme.fastclick %}
   {% set js_vendors.fastclick = 'fastclick/lib/fastclick.min.js?v=1.0.6' %}
 {% endif %}
@@ -18,17 +26,17 @@
   {% set js_vendors.lazyload = 'lazyload/lozad.min.js?v=1.10.0' %}
 {% endif %}
 
-{% if theme.motion.enable %}
-  {% set js_vendors.velocity = 'velocity/velocity.min.js?v=1.2.1' %}
-  {% set js_vendors.velocity_ui = 'velocity/velocity.ui.min.js?v=1.2.1' %}
+{% if theme.pangu %}
+  {% set js_vendors.pangu = 'pangu/dist/pangu.min.js?v=4.0.7' %}
 {% endif %}
 
-{% if theme.fancybox %}
-  {% set js_vendors.fancybox = 'fancybox/source/jquery.fancybox.pack.js' %}
+{% if theme.reading_progress.enable %}
+  {% set js_vendors.reading_progress = 'reading_progress/reading_progress.js' %}
 {% endif %}
 
-{% if theme.mediumzoom %}
-  {% set js_vendors.mediumzoom = 'mediumzoom/medium-zoom.min.js' %}
+{% if theme.motion.enable %}
+  {% set js_vendors.velocity = 'velocity/velocity.min.js?v=1.2.1' %}
+  {% set js_vendors.velocity_ui = 'velocity/velocity.ui.min.js?v=1.2.1' %}
 {% endif %}
 
 {% if theme.canvas_nest.enable %}
@@ -69,10 +77,6 @@
   <script size="{{ theme.canvas_ribbon.size }}" alpha="{{ theme.canvas_ribbon.alpha }}" zIndex="{{theme.canvas_ribbon.zIndex }}" src="{{ canvas_ribbon_uri }}"></script>
 {% endif %}
 
-{% if theme.reading_progress.enable %}
-  {% set js_vendors.reading_progress = 'reading_progress/reading_progress.js' %}
-{% endif %}
-
 {% for name, internal in js_vendors %}
   {% set internal_script = url_for(theme.vendors._internal + '/' + internal) %}
   <script src="{{ theme.vendors[name] | default(internal_script) }}"></script>

layout/_third-party/index.swig

@@ -0,0 +1,11 @@
+{% include 'math/index.swig' %}
+{% include 'quicklink.swig' %}
+{% include 'bookmark.swig' %}
+{% include 'schedule.swig' %}
+{% include 'comments/index.swig' %}
+{% include 'analytics/analytics-with-jquery.swig' %}
+{% include 'search/index.swig' %}
+{% include 'chat/index.swig' %}
+{% include 'tags/index.swig' %}
+{% include 'baidu-push.swig' %}
+{% include 'rating.swig' %}

source/css/_common/components/third-party/needsharebutton.styl

@@ -13,7 +13,7 @@
 
 #needsharebutton-float {
     position: fixed;
-    bottom: 38px;
+    bottom: 88px;
     left: -8px;
     z-index: 9999;
     cursor: pointer;

source/css/_common/components/third-party/third-party.styl

@@ -1,5 +1,5 @@
 @import "gitalk" if hexo-config('gitalk.enable');
-@import "localsearch";
+@import "localsearch" if hexo-config('local_search.enable');
 @import "algolia-search" if hexo-config('algolia_search.enable');
 @import "needsharebutton" if hexo-config('needmoreshare2.enable');
 @import "related-posts" if hexo-config('related_posts.enable');

source/js/next-boot.js

@@ -6,12 +6,17 @@ $(document).ready(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.fastclick && NexT.utils.isMobile() && window.FastClick.attach(document.body);
   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.registerESCKeyEvent();
-
   CONFIG.back2top.enable && NexT.utils.registerBackToTop();
+  NexT.utils.embeddedVideoTransformer();
 
   // Mobile top menu bar.
   $('.site-nav-toggle button').on('click', function() {
@@ -26,21 +31,6 @@ $(document).ready(function() {
     });
   });
 
-  CONFIG.fancybox && NexT.utils.wrapImageWithFancyBox();
-  CONFIG.mediumzoom && window.mediumZoom('.post-body img');
-  CONFIG.copycode.enable && NexT.utils.registerCopyCode();
-  CONFIG.tabs && NexT.utils.registerTabsTag();
-
-  NexT.utils.embeddedVideoTransformer();
-
-  // 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();
-
   /**
    * Init Sidebar & TOC inner dimensions on all pages and for all schemes.
    * Need for Sidebar/TOC inner scrolling if content taller then viewport.
@@ -81,4 +71,12 @@ $(document).ready(function() {
     $('table').not('.gist table').wrap('<div class="table-container"></div>');
   }
   wrapTable();
+
+  // 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();
 });

source/js/utils.js

@@ -6,8 +6,7 @@ NexT.utils = {
    * Wrap images with fancybox.
    */
   wrapImageWithFancyBox: function() {
-    $('.content img')
-      .not('#qr img')
+    $('.post-body img')
       .each(function() {
         var $image = $(this);
         var imageTitle = $image.attr('title') || $image.attr('alt');
@@ -156,8 +155,8 @@ NexT.utils = {
       var contentVisibilityHeight = NexT.utils.getContentVisibilityHeight();
       var scrollPercent = scrollTop / contentVisibilityHeight;
       var scrollPercentRounded = Math.round(scrollPercent * 100);
-      var scrollPercentMaxed = scrollPercentRounded > 100 ? 100 : scrollPercentRounded;
-      $('#scrollpercent>span').html(scrollPercentMaxed);
+      var scrollPercentMaxed = Math.min(scrollPercentRounded, 100);
+      $('#scrollpercent > span').html(scrollPercentMaxed);
     }
 
     // For init back to top in sidebar if page was scrolled after page refresh.