Fixes and enhancements. [11]

_config.yml

@@ -171,6 +171,9 @@ toc:
   # Automatically add list number to toc.
   number: true
 
+  # If true, all words will placed on next lines if header width longer then sidebar width.
+  wrap: false
+
 
 # Creative Commons 4.0 International License.
 # http://creativecommons.org/
@@ -245,6 +248,7 @@ post_wordcount:
   item_text: true
   wordcount: false
   min2read: false
+  separated_meta: true
 
 # Wechat Subscriber
 #wechat_subscriber:

layout/_layout.swig

@@ -67,7 +67,9 @@
   {% set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %}
   {% include scheme_script %}
 
-  {% block script_extra %}{% endblock %}
+  {% block script_extra %}
+    {% include '_scripts/pages/post-details.swig' %}
+  {% endblock %}
 
   {% include '_scripts/boostrap.swig' %}
 

layout/_macro/post.swig

@@ -207,7 +207,9 @@
           {% if theme.post_wordcount.wordcount or theme.post_wordcount.min2read %}
             <div class="post-wordcount">
               {% if theme.post_wordcount.wordcount %}
-                <span class="post-meta-divider">|</span>
+                {% if not theme.post_wordcount.separated_meta %}
+                  <span class="post-meta-divider">|</span>
+                {% endif %}
                 <span class="post-meta-item-icon">
                   <i class="fa fa-file-word-o"></i>
                 </span>

layout/_macro/sidebar.swig

@@ -10,7 +10,7 @@
   <aside id="sidebar" class="sidebar">
     <div class="sidebar-inner">
 
-      {% set display_toc = is_post and theme.toc.enable %}
+      {% set display_toc = is_post and theme.toc.enable or is_page and theme.toc.enable %}
 
       {% if display_toc and toc(page.content).length > 1 %}
         <ul class="sidebar-nav motion-element">

layout/_third-party/rating.swig

@@ -0,0 +1,18 @@
+{% if theme.rating.enable and (not is_home() and is_post()) %}
+  <script type="text/javascript">
+  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 %}

layout/page.swig

@@ -13,6 +13,8 @@
   #}{% endif %}{#
 #}{% endblock %}
 
+{% block page_class %}page-post-detail{% endblock %}
+
 {% block content %}
 
   <div id="posts" class="posts-expand">

scripts/tags/lazy-image.js

@@ -0,0 +1,26 @@
+/* global hexo */
+// Usage: {% lazyimage /path/to/image, alt, title %}
+// Alias: {% li /path/to/image, alt, title %}
+
+function lazyImage(args) {
+  args = args.join(' ').split(',');
+  var src = args[0];
+  var alt = args[1] || '';
+  var title = args[2] || '';
+
+  if (!src) {
+    hexo.log.warn('Image src can NOT be empty');
+  }
+  alt = alt.trim();
+  title = title.trim();
+
+  var image = ['<span itemprop="image" itemscope itemtype="http://schema.org/ImageObject"><img itemprop="url image" src="/images/loading.gif" data-original="' + src + '" class="full-image"'];
+  alt.length > 0 && image.push('alt="' + alt + '"');
+  title.length > 0 && image.push('title="' + title + '"');
+  image.push('/><meta itemprop="width" content="auto"><meta itemprop="height" content="auto"></span>');
+
+  return image.join(' ');
+}
+
+hexo.extend.tag.register('lazyimage', lazyImage);
+hexo.extend.tag.register('li', lazyImage);

source/css/_common/components/post/post-collapse.styl

@@ -35,7 +35,7 @@
     position: relative;
     margin: 60px 0;
 
-    h2 { margin-left: 20px; }
+    h1, h2 { margin-left: 20px; }
 
     small { color: $grey; margin-left: 5px; }
 

source/css/_common/components/post/post-wordcount.styl

@@ -0,0 +1,3 @@
+.post-wordcount {
+  display: inline-block;
+}

source/css/_common/components/post/post.styl

@@ -44,4 +44,5 @@
 @import "post-eof";
 @import "post-gallery";
 @import "post-reward" if hexo-config('alipay') or hexo-config('wechatpay');
-@import "post-copyright.styl" if hexo-config('post_copyright.enable')
+@import "post-copyright" if hexo-config('post_copyright.enable');
+@import "post-wordcount" if !hexo-config('post_wordcount.separated_meta');

source/css/_common/components/sidebar/sidebar-toc.styl

@@ -33,7 +33,7 @@
 .post-toc .nav-item {
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
+  white-space: nowrap if !hexo-config('toc.wrap');
   line-height: 1.8;
 }
 

source/js/src/utils.js

@@ -14,7 +14,8 @@ NexT.utils = NexT.$u = {
         var $imageWrapLink = $image.parent('a');
 
         if ($imageWrapLink.size() < 1) {
-          $imageWrapLink = $image.wrap('<a href="' + this.getAttribute('src') + '"></a>').parent('a');
+	        var imageLink = ($image.attr('data-original')) ? this.getAttribute('data-original') : this.getAttribute('src');
+          $imageWrapLink = $image.wrap('<a href="' + imageLink + '"></a>').parent('a');
         }
 
         $imageWrapLink.addClass('fancybox fancybox.image');
@@ -39,8 +40,9 @@ NexT.utils = NexT.$u = {
 
   lazyLoadPostsImages: function () {
     $('#posts').find('img').lazyload({
-      placeholder: '/images/loading.gif',
-      effect: 'fadeIn'
+      //placeholder: '/images/loading.gif',
+      effect: 'fadeIn',
+      threshold : 0
     });
   },