加载优化，ref #136

Author: yscoder

layout/_partial/google-analytics.ejs

@@ -1,14 +1,10 @@
 <% if (theme.google_analytics){ %>
 <!-- Google Analytics -->
 <script>
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-ga('create', '<%= theme.google_analytics %>', 'auto');
+window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+ga('create', '<%- theme.google_analytics %>', 'auto');
 ga('send', 'pageview');
-
 </script>
+<script async src='https://www.google-analytics.com/analytics.js'></script>
 <!-- End Google Analytics -->
 <% } %>

layout/_partial/head.ejs

@@ -46,4 +46,6 @@
   <% } %>
   <%- favicon_tag(theme.favicon) %>
   <link rel="stylesheet" href="<%= url_for('/css/style.css?v='+ theme_version()) %>">
+  <script>window.lazyScripts=[]</script>
+  <%- partial('google-analytics') %>
 </head>

layout/_partial/mathjax.ejs

@@ -1,3 +1,4 @@
+<% if (theme.mathjax){ %>
 <!-- mathjax config similar to math.stackexchange -->
 
 <script type="text/x-mathjax-config">
@@ -12,9 +13,10 @@ MathJax.Hub.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';                 
-    }       
+        all[i].SourceElement().parentNode.className += ' has-jax';
+    }
 });
 </script>
 
-<script type="text/javascript" async src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
+<script async src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML" async></script>
+<% } %>

layout/_partial/post/comment.ejs

@@ -8,18 +8,11 @@
 
 <% if (post.comments && theme.disqus_shortname){ %>
 <section id="comments">
-  <div id="disqus_thread"></div>
-    <script type="text/javascript">
-    /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-    var disqus_shortname = '<%=theme.disqus_shortname%>'; // required: replace example with your forum shortname
-
-    /* * * DON'T EDIT BELOW THIS LINE * * */
-    (function() {
-      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-      dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-    })();
-  </script>
-  <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+    <div id="disqus_thread"></div>
+    <script>
+    var disqus_shortname = '<%- theme.disqus_shortname %>';
+    lazyScripts.push('//' + disqus_shortname + '.disqus.com/embed.js')
+    </script>
+    <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
 </section>
 <% } %>

layout/_partial/post/duoshuo.ejs

@@ -1,8 +1,8 @@
 <div class="duoshuo" id="comments">
 	<div class="ds-thread" data-thread-key="<%=key%>" data-title="<%=title%>" data-url="<%=url.replace(/index\.html$/, '')%>"></div>
 </div>
-<script src="<%= url_for('/js/embed' + (cache ? '.min': '') + '.js?v=' + theme_version()) %>"></script>
-<script src="//cdn.bootcss.com/marked/0.3.6/marked.min.js" async="async"></script>
+<script src="<%- url_for('/js/embed' + (cache ? '.min': '') + '.js?v=' + theme_version()) %>" async></script>
 <script>
 var duoshuoQuery = {short_name:'<%=theme.duoshuo %>', theme: 'none'}
+lazyScripts.push('//cdn.bootcss.com/marked/0.3.6/marked.min.js')
 </script>

layout/_partial/post/share.ejs

@@ -1,6 +1,6 @@
 <%
     // 使用 sns 直接分享接口
-    // 微信使用 http://s.jiathis.com/qrcode.php?url=xxx
+    // 微信使用 qrcode helper 或 http://goqr.me/api/ 生成二维码
     var sUrl = url.replace(/index\.html$/, '')
     var sTitle = page.title ? '《'+ page.title +'》 — ' + config.title : config.title
     var sDesc = truncate(strip_html(page.excerpt || config.description), { length: 80})
@@ -49,6 +49,6 @@
 <div class="page-modal wx-share" id="wxShare">
     <a class="close" href="javascript:;"><i class="icon icon-close"></i></a>
     <p>扫一扫，分享到微信</p>
-    <img src="<%- 'qrcode' in locals ? qrcode(sUrl) : 'http://s.jiathis.com/qrcode.php?url=' + sUrl  %>" alt="微信分享二维码">
+    <img src="<%- 'qrcode' in locals ? qrcode(sUrl) : '//api.qrserver.com/v1/create-qr-code/?data=' + sUrl  %>" alt="微信分享二维码">
 </div>
 <% } %>

layout/_partial/script.ejs

@@ -1,17 +1,14 @@
 <script src="//cdn.bootcss.com/node-waves/0.7.4/waves.min.js"></script>
-<script src="<%= url_for('/js/main' + (cache ? '.min': '') + '.js?v=' + theme_version()) %>"></script>
 
-<% if (theme.search){ %>
-<%- partial('search') %>
-<script src="<%= url_for('/js/search' + (cache ? '.min': '') + '.js?v=' + theme_version()) %>"></script>
-<% } %>
-
-<% if (theme.mathjax){ %>
 <%- partial('mathjax') %>
-<% } %>
 
 <% if (theme.cnzz){ %>
-<script src="//s95.cnzz.com/z_stat.php?id=<%=theme.cnzz %>&web_id=<%=theme.cnzz %>"></script>
+<script>lazyScripts.push('//s95.cnzz.com/z_stat.php?id=<%-theme.cnzz %>&web_id=<%-theme.cnzz %>')</script>
 <% } %>
 
-<%- partial('google-analytics') %>
+<script src="<%- url_for('/js/main' + (cache ? '.min': '') + '.js?v=' + theme_version()) %>"></script>
+
+<% if (theme.search){ %>
+<%- partial('search') %>
+<script src="<%- url_for('/js/search' + (cache ? '.min': '') + '.js?v=' + theme_version()) %>" async></script>
+<% } %>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-material-indigo",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Material Design theme for Hexo.",
   "keywords": [
     "hexo",

source/css/_partial/fontawesome.less

@@ -55,9 +55,6 @@
   padding-right: 5px;
 }
 
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
-   readers do not read off random characters that represent icons */
-
 @fa-var-500px: "\f26e";
 @fa-var-address-book: "\f2b9";
 @fa-var-address-book-o: "\f2ba";

source/js/main.js

@@ -403,7 +403,12 @@
             forEach.call($$('.img-lightbox'), function (el) {
                 new LightBox(el)
             })
-        })()
+        })(),
+        loadScript: function (scripts) {
+            body.insertAdjacentHTML('beforeend', scripts.map(function (src) {
+                return '<script async src="' + src + '"></script>'
+            }).join(''))
+        }
     };
 
     w.addEventListener('load', function () {
@@ -414,6 +419,8 @@
         Blog.toc.actived(top);
         loading.classList.remove('active');
         Blog.page.loaded();
+
+        w.lazyScripts && w.lazyScripts.length && Blog.loadScript(w.lazyScripts)
     });
 
     var ignoreUnload = false;
@@ -482,8 +489,11 @@
         return g
     }, w.BLOG);
 
-    Waves.init();
-    Waves.attach('.global-share li', ['waves-block']);
-    Waves.attach('.article-tag-list-link, #page-nav a, #page-nav span', ['waves-button']);
-
+    if (w.Waves) {
+        Waves.init();
+        Waves.attach('.global-share li', ['waves-block']);
+        Waves.attach('.article-tag-list-link, #page-nav a, #page-nav span', ['waves-button']);
+    } else {
+        console.error('Waves loading failed.')
+    }
 })(window, document);