From abcb5b943d48852961016f52c36dff579c87692a Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Thu, 27 Dec 2018 23:07:52 +0800
Subject: [PATCH 1/2] Fix #271

---
 _config.yml                              | 12 +++++++---
 layout/_third-party/comments/valine.swig | 29 +++++++++++++-----------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/_config.yml b/_config.yml
index 9a3f968249..455923c3b9 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1023,11 +1023,17 @@ vendors:
   # reading_progress: //cdn.jsdelivr.net/gh/theme-next/theme-next-reading-progress@1.1/reading_progress.min.js
   reading_progress:
 
-  # valine comment
+  # Internal version: 3.11.1
+  # See: https://www.npmjs.com/package/leancloud-storage
+  # Example:
+  # leancloud: //cdn.jsdelivr.net/npm/leancloud-storage@3.11.1/dist/av-min.js
+  leancloud:
+
+  # Internal version: 1.3.4
   # See: https://github.com/xCss/Valine
   # Example:
-  # valine: //cdn.jsdelivr.net/npm/valine@1.3.3/dist/Valine.min.js
-  # valine: //cdnjs.cloudflare.com/ajax/libs/valine/1.3.3/Valine.min.js
+  # valine: //cdn.jsdelivr.net/npm/valine@1.3.4/dist/Valine.min.js
+  # valine: //cdnjs.cloudflare.com/ajax/libs/valine/1.3.4/Valine.min.js
   valine:
 
   # Internal version: 1.4.0
diff --git a/layout/_third-party/comments/valine.swig b/layout/_third-party/comments/valine.swig
index da06d7f96d..bc12fd7825 100644
--- a/layout/_third-party/comments/valine.swig
+++ b/layout/_third-party/comments/valine.swig
@@ -1,28 +1,31 @@
 {% if theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
-  <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
+  {% set leancloud_uri = '//cdn1.lncld.net/static/js/3.11.1/av-min.js' %}
   {% set valine_uri = '//unpkg.com/valine/dist/Valine.min.js' %}
+  {% if theme.vendors.leancloud %}
+    {% set leancloud_uri = theme.vendors.leancloud %}
+  {% endif %}
   {% if theme.vendors.valine %}
     {% set valine_uri = theme.vendors.valine %}
   {% endif %}
+  <script src="{{ leancloud_uri }}"></script>
   <script src="{{ valine_uri }}"></script>
-
   <script>
     var GUEST = ['nick','mail','link'];
     var guest = '{{ theme.valine.guest_info }}';
     guest = guest.split(',').filter(function (item) {
-      return GUEST.indexOf(item)>-1;
+      return GUEST.indexOf(item) > -1;
     });
     new Valine({
-        el: '#comments' ,
-        verify: {{ theme.valine.verify }},
-        notify: {{ theme.valine.notify }},
-        appId: '{{ theme.valine.appid }}',
-        appKey: '{{ theme.valine.appkey }}',
-        placeholder: '{{ theme.valine.placeholder }}',
-        avatar:'{{ theme.valine.avatar }}',
-        meta:guest,
-        pageSize:'{{ theme.valine.pageSize }}' || 10,
-        visitor: {{ theme.valine.visitor }}
+      el: '#comments' ,
+      verify: {{ theme.valine.verify }},
+      notify: {{ theme.valine.notify }},
+      appId: '{{ theme.valine.appid }}',
+      appKey: '{{ theme.valine.appkey }}',
+      placeholder: '{{ theme.valine.placeholder }}',
+      avatar: '{{ theme.valine.avatar }}',
+      meta:guest,
+      pageSize: '{{ theme.valine.pageSize }}' || 10,
+      visitor: {{ theme.valine.visitor }}
     });
   </script>
 {% endif %}

From 25d6db5cde952e0bf30e2ddc07b1f7d5ba5c36d2 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Fri, 28 Dec 2018 00:20:12 +0800
Subject: [PATCH 2/2] format code

---
 .../analytics/application-insights.swig       | 10 ++---
 .../analytics/cnzz-analytics.swig             |  4 +-
 .../_third-party/analytics/facebook-sdk.swig  | 33 +++++++-------
 .../analytics/google-analytics.swig           | 15 +++----
 layout/_third-party/analytics/growingio.swig  |  4 +-
 .../_third-party/analytics/tencent-mta.swig   | 23 +++++-----
 .../_third-party/analytics/vkontakte-api.swig | 44 +++++++++----------
 layout/_third-party/math/mathjax.swig         | 30 ++++++-------
 layout/_third-party/needsharebutton.swig      |  6 +--
 layout/_third-party/rating.swig               | 30 +++++++------
 layout/_third-party/seo/baidu-push.swig       | 24 +++++-----
 layout/page.swig                              | 36 +++++++--------
 12 files changed, 127 insertions(+), 132 deletions(-)

diff --git a/layout/_third-party/analytics/application-insights.swig b/layout/_third-party/analytics/application-insights.swig
index c1dda0e0b5..9844cbf4c8 100644
--- a/layout/_third-party/analytics/application-insights.swig
+++ b/layout/_third-party/analytics/application-insights.swig
@@ -1,11 +1,11 @@
 {% if theme.application_insights %}
-<script>
-  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
+  <script>
+    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
     }({
-        instrumentationKey:"{{ theme.application_insights }}"
+      instrumentationKey:"{{ theme.application_insights }}"
     });
     window.appInsights=appInsights;
     appInsights.trackPageView();
-</script>
+  </script>
 {% endif %}
diff --git a/layout/_third-party/analytics/cnzz-analytics.swig b/layout/_third-party/analytics/cnzz-analytics.swig
index bffb73cdcb..9693cda230 100644
--- a/layout/_third-party/analytics/cnzz-analytics.swig
+++ b/layout/_third-party/analytics/cnzz-analytics.swig
@@ -1,7 +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 }}" language="JavaScript"></script>
+    <script src="//s95.cnzz.com/z_stat.php?id={{ theme.cnzz_siteid }}&web_id={{ theme.cnzz_siteid }}"></script>
   </div>
-
 {% endif %}
diff --git a/layout/_third-party/analytics/facebook-sdk.swig b/layout/_third-party/analytics/facebook-sdk.swig
index 7b5a291876..d7cd7ee2f6 100644
--- a/layout/_third-party/analytics/facebook-sdk.swig
+++ b/layout/_third-party/analytics/facebook-sdk.swig
@@ -1,19 +1,18 @@
 {% if theme.facebook_sdk.enable %}
-<script>
-  window.fbAsyncInit = function() {
-    FB.init({
-      appId      : '{{ theme.facebook_sdk.app_id }}',
-      xfbml      : true,
-      version    : 'v2.10'
-    });
-  };
-
-  (function(d, s, id){
-     var js, fjs = d.getElementsByTagName(s)[0];
-     if (d.getElementById(id)) {return;}
-     js = d.createElement(s); js.id = id;
-     js.src = "//connect.facebook.net/{{ config.language|replace('-', '_') }}/sdk.js";
-     fjs.parentNode.insertBefore(js, fjs);
-   }(document, 'script', 'facebook-jssdk'));
-</script>
+  <script>
+    window.fbAsyncInit = function() {
+      FB.init({
+        appId  : '{{ theme.facebook_sdk.app_id }}',
+        xfbml  : true,
+        version: 'v2.10'
+      });
+    };
+    (function(d, s, id) {
+      var js, fjs = d.getElementsByTagName(s)[0];
+      if (d.getElementById(id)) {return;}
+      js = d.createElement(s); js.id = id;
+      js.src = "//connect.facebook.net/{{ config.language|replace('-', '_') }}/sdk.js";
+      fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));
+  </script>
 {% endif %}
diff --git a/layout/_third-party/analytics/google-analytics.swig b/layout/_third-party/analytics/google-analytics.swig
index 1190babc94..fb7fc604f5 100644
--- a/layout/_third-party/analytics/google-analytics.swig
+++ b/layout/_third-party/analytics/google-analytics.swig
@@ -1,10 +1,9 @@
 {% if theme.google_analytics %}
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ theme.google_analytics }}"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '{{ theme.google_analytics }}');
-</script>
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ theme.google_analytics }}"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+    gtag('config', '{{ theme.google_analytics }}');
+  </script>
 {% endif %}
diff --git a/layout/_third-party/analytics/growingio.swig b/layout/_third-party/analytics/growingio.swig
index 4f67c75003..b39380378a 100644
--- a/layout/_third-party/analytics/growingio.swig
+++ b/layout/_third-party/analytics/growingio.swig
@@ -1,7 +1,7 @@
 {% if theme.growingio_analytics %}
   <script type='text/javascript'>
-  !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");
+    !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');
+    gio('send');
   </script>
 {% endif %}
diff --git a/layout/_third-party/analytics/tencent-mta.swig b/layout/_third-party/analytics/tencent-mta.swig
index f4b6470157..032e41ab43 100644
--- a/layout/_third-party/analytics/tencent-mta.swig
+++ b/layout/_third-party/analytics/tencent-mta.swig
@@ -1,14 +1,13 @@
 {% if theme.tencent_mta %}
-<script>
-  	var _mtac = {};
-  	(function() {
-  		var mta = document.createElement("script");
-  		mta.src = "https://pingjs.qq.com/h5/stats.js?v2.0.4";
-  		mta.setAttribute("name", "MTAH5");
-  		mta.setAttribute("sid", "{{theme.tencent_mta}}");
-
-  		var s = document.getElementsByTagName("script")[0];
-  		s.parentNode.insertBefore(mta, s);
-  	})();
-</script>
+  <script>
+    var _mtac = {};
+    (function() {
+      var mta = document.createElement("script");
+      mta.src = "https://pingjs.qq.com/h5/stats.js?v2.0.4";
+      mta.setAttribute("name", "MTAH5");
+      mta.setAttribute("sid", "{{theme.tencent_mta}}");
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(mta, s);
+    })();
+  </script>
 {% endif %}
diff --git a/layout/_third-party/analytics/vkontakte-api.swig b/layout/_third-party/analytics/vkontakte-api.swig
index dfcc953b78..ee069d4193 100644
--- a/layout/_third-party/analytics/vkontakte-api.swig
+++ b/layout/_third-party/analytics/vkontakte-api.swig
@@ -1,27 +1,25 @@
 {% if theme.vkontakte_api.enable %}
+  <div id="vk_api_transport"></div>
+  <script>
+    window.vkAsyncInit = function() {
+      VK.init({
+        apiId: {{ theme.vkontakte_api.app_id }}
+      });
 
-	<div id="vk_api_transport"></div>
-	<script>
-		window.vkAsyncInit = function() {
-			VK.init({
-				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});
-			{% endif %}
-
-			{% if page.comments and theme.vkontakte_api.comments %}
-				VK.Widgets.Comments("vk_comments", {limit: {{  theme.vkontakte_api.num_of_posts }}, attach: "*"});
-			{% endif %}
-		};
-		setTimeout(function() {
-			var el = document.createElement("script");
-			el.type = "text/javascript";
-			el.src = "//vk.com/js/api/openapi.js";
-			el.async = true;
-			document.getElementById("vk_api_transport").appendChild(el);
-		}, 0);
-	</script>
+      {% if not is_home() and (is_post() and theme.vkontakte_api.like) %}
+        VK.Widgets.Like("vk_like", {type: "mini", height: 20});
+      {% endif %}
 
+      {% if page.comments and theme.vkontakte_api.comments %}
+        VK.Widgets.Comments("vk_comments", {limit: {{  theme.vkontakte_api.num_of_posts }}, attach: "*"});
+      {% endif %}
+    };
+    setTimeout(function() {
+      var el = document.createElement("script");
+      el.type = "text/javascript";
+      el.src = "//vk.com/js/api/openapi.js";
+      el.async = true;
+      document.getElementById("vk_api_transport").appendChild(el);
+    }, 0);
+  </script>
 {% endif %}
diff --git a/layout/_third-party/math/mathjax.swig b/layout/_third-party/math/mathjax.swig
index 6ce58109e8..a92c1a62b1 100644
--- a/layout/_third-party/math/mathjax.swig
+++ b/layout/_third-party/math/mathjax.swig
@@ -1,26 +1,26 @@
 <script type="text/x-mathjax-config">
-    MathJax.Hub.Config({
-      tex2jax: {
-        inlineMath: [ ['$','$'], ["\\(","\\)"]  ],
-        processEscapes: true,
-        skipTags: ['script', 'noscript', 'style', 'textarea', 'pre', 'code']
-      },
-      TeX: {equationNumbers: { autoNumber: "AMS" }}
-    });
+  MathJax.Hub.Config({
+    tex2jax: {
+      inlineMath: [ ['$','$'], ["\\(","\\)"]  ],
+      processEscapes: true,
+      skipTags: ['script', 'noscript', 'style', 'textarea', 'pre', 'code']
+    },
+    TeX: {equationNumbers: { autoNumber: "AMS" }}
+  });
 </script>
 
 <script type="text/x-mathjax-config">
-    MathJax.Hub.Queue(function() {
-      var all = MathJax.Hub.getAllJax(), i;
-        for (i=0; i < all.length; i += 1) {
-          all[i].SourceElement().parentNode.className += ' has-jax';
-        }
-    });
+  MathJax.Hub.Queue(function() {
+    var all = MathJax.Hub.getAllJax(), i;
+      for (i=0; i < all.length; i += 1) {
+        all[i].SourceElement().parentNode.className += ' has-jax';
+      }
+  });
 </script>
 <script src="{{ theme.math.mathjax.cdn }}"></script>
 
 <style>
 .MathJax_Display {
-    overflow: auto hidden;
+  overflow: auto hidden;
 }
 </style>
diff --git a/layout/_third-party/needsharebutton.swig b/layout/_third-party/needsharebutton.swig
index 9120520c67..77dc9b26fe 100644
--- a/layout/_third-party/needsharebutton.swig
+++ b/layout/_third-party/needsharebutton.swig
@@ -9,16 +9,16 @@
     {% if theme.needmoreshare2.postbottom.enable %}
       pbOptions = {};
       {% for k,v in theme.needmoreshare2.postbottom.options %}
-          pbOptions.{{ k }} = "{{ v }}";
+        pbOptions.{{ k }} = "{{ v }}";
       {% endfor %}
       new needShareButton('#needsharebutton-postbottom', pbOptions);
     {% endif %}
     {% if theme.needmoreshare2.float.enable %}
       flOptions = {};
       {% for k,v in theme.needmoreshare2.float.options %}
-          flOptions.{{ k }} = "{{ v }}";
+        flOptions.{{ k }} = "{{ v }}";
       {% endfor %}
       new needShareButton('#needsharebutton-float', flOptions);
     {% endif %}
   </script>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/layout/_third-party/rating.swig b/layout/_third-party/rating.swig
index 3ace732ab6..e51e0945a2 100644
--- a/layout/_third-party/rating.swig
+++ b/layout/_third-party/rating.swig
@@ -1,18 +1,20 @@
 {% if theme.rating.enable and (not is_home() and is_post()) %}
   <script>
-  wpac_init = window.wpac_init || [];
-  wpac_init.push({widget: 'Rating', id: {{ theme.rating.id }},
-    el: 'wpac-rating',
-    color: '{{ theme.rating.color }}'
-  });
-  (function() {
-    if ('WIDGETPACK_LOADED' in window) return;
-    WIDGETPACK_LOADED = true;
-    var mc = document.createElement('script');
-    mc.type = 'text/javascript';
-    mc.async = true;
-    mc.src = '//embed.widgetpack.com/widget.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(mc, s.nextSibling);
-  })();
+    wpac_init = window.wpac_init || [];
+    wpac_init.push({
+      widget: 'Rating',
+      id: {{ theme.rating.id }},
+      el: 'wpac-rating',
+      color: '{{ theme.rating.color }}'
+    });
+    (function() {
+      if ('WIDGETPACK_LOADED' in window) return;
+      WIDGETPACK_LOADED = true;
+      var mc = document.createElement('script');
+      mc.type = 'text/javascript';
+      mc.async = true;
+      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/seo/baidu-push.swig b/layout/_third-party/seo/baidu-push.swig
index ee6838f3a6..d2ecfdf6bb 100644
--- a/layout/_third-party/seo/baidu-push.swig
+++ b/layout/_third-party/seo/baidu-push.swig
@@ -1,16 +1,16 @@
 {% if theme.baidu_push %}
-<script>
-(function(){
-    var bp = document.createElement('script');
-    var curProtocol = window.location.protocol.split(':')[0];
-    if (curProtocol === 'https') {
+  <script>
+    (function(){
+      var bp = document.createElement('script');
+      var curProtocol = window.location.protocol.split(':')[0];
+      if (curProtocol === 'https') {
         bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';        
-    }
-    else {
+      }
+      else {
         bp.src = 'http://push.zhanzhang.baidu.com/push.js';
-    }
-    var s = document.getElementsByTagName("script")[0];
-    s.parentNode.insertBefore(bp, s);
-})();
-</script>
+      }
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(bp, s);
+    })();
+  </script>
 {% endif %}
diff --git a/layout/page.swig b/layout/page.swig
index 5498cc0265..24dd1d9a13 100644
--- a/layout/page.swig
+++ b/layout/page.swig
@@ -4,11 +4,11 @@
   {% block title %}{#
   #}{% set page_title_suffix = ' | ' + title %}{#
 
-  #}{% if page.type === "categories" and not page.title %}{#
+  #}{% if page.type === 'categories' and not page.title %}{#
     #}{{ __('title.category') + page_title_suffix }}{#
-  #}{% elif page.type === "tags" and not page.title %}{#
+  #}{% elif page.type === 'tags' and not page.title %}{#
     #}{{ __('title.tag') + page_title_suffix }}{#
-  #}{% elif page.type === "schedule" and not page.title %}{#
+  #}{% elif page.type === 'schedule' and not page.title %}{#
     #}{{ __('title.schedule') + page_title_suffix }}{#
   #}{% else %}{#
     #}{{ page.title + page_title_suffix }}{#
@@ -30,16 +30,16 @@
       {#################}
       <div class="post-body{% if theme.han %} han-init-context{% endif %}{% if page.direction && page.direction.toLowerCase() === 'rtl' %} rtl{% endif %}">
         {# tagcloud page support #}
-        {% if page.type === "tags" %}
+        {% if page.type === 'tags' %}
           <div class="tag-cloud">
             <div class="tag-cloud-title">
-                {% set visibleTags = 0 %}
-                {% for tag in site.tags %}
-                  {% if tag.length %}
-                    {% set visibleTags += 1 %}
-                  {% endif %}
-                {% endfor %}
-                {{ _p('counter.tag_cloud', visibleTags) }}
+              {% set visibleTags = 0 %}
+              {% for tag in site.tags %}
+                {% if tag.length %}
+                  {% set visibleTags += 1 %}
+                {% endif %}
+              {% endfor %}
+              {{ _p('counter.tag_cloud', visibleTags) }}
             </div>
             <div class="tag-cloud-tags">
               {{ tagcloud({min_font: 12, max_font: 30, amount: 300, color: true, start_color: '#ccc', end_color: '#111'}) }}
@@ -48,13 +48,13 @@
         {% elif page.type === 'categories' %}
           <div class="category-all-page">
             <div class="category-all-title">
-                {% set visibleCategories = 0 %}
-                {% for cat in site.categories %}
-                  {% if cat.length %}
-                    {% set visibleCategories += 1 %}
-                  {% endif %}
-                {% endfor %}
-                {{ _p('counter.categories', visibleCategories) }}
+              {% set visibleCategories = 0 %}
+              {% for cat in site.categories %}
+                {% if cat.length %}
+                  {% set visibleCategories += 1 %}
+                {% endif %}
+              {% endfor %}
+              {{ _p('counter.categories', visibleCategories) }}
             </div>
             <div class="category-all">
               {{ list_categories() }}