merge(#437): merge Halyul/feat/auto-tag-category into canary

feat: auto detect tags categories toc, fix: burger error
iblh · Jul 24, 2017 · d62d09a · d62d09a
2 parents 9ab4ea2 + c59b852
commit d62d09a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/layout/_partial/Paradox-post-info.ejs b/layout/_partial/Paradox-post-info.ejs
@@ -26,7 +26,7 @@
     <% } %>
 
     <!-- Tags (bookmark) -->
-    <% if(page.notag !== true) { %>
+    <% if (page.tags && page.tags.length) { %>
     <button id="article-functions-viewtags-button" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon">
         <i class="material-icons" role="presentation">bookmark</i>
         <span class="visuallyhidden">bookmark</span>

diff --git a/layout/_partial/Paradox-post_entry.ejs b/layout/_partial/Paradox-post_entry.ejs
@@ -42,14 +42,16 @@
             </div>
         </div>
         <div id="post_entry-right-info">
-            <!-- Category -->
-            <span class="post_entry-category">
-                <%- list_categories(post.categories, {
-                    show_count: false,
-                    class: 'post_category',
-                    style: 'none'
-                }) %>
-            </span>
+          <% if (post.categories && post.categories.length) { %>
+              <!-- Category -->
+              <span class="post_entry-category">
+                  <%- list_categories(post.categories, {
+                      show_count: false,
+                      class: 'post_category',
+                      style: 'none'
+                  }) %>
+              </span>
+            <% } %>
 
             <% if(theme.comment.use === 'duoshuo') { %>
                 <!-- Comment Number -->

diff --git a/layout/_partial/toc_button.ejs b/layout/_partial/toc_button.ejs
@@ -43,5 +43,9 @@
         }) %>
     </ul>
     <% } %>
+    <!-- post toc -->
+    <script type="text/ls-javascript" id="post-toc-script">
+      (function(){if(document.querySelector('ol.post-toc')===null){document.querySelector('button#post-toc-trigger-btn').style.display='none'}})();
+    </script>
 
 <% } %>
diff --git a/source/js/js.js b/source/js/js.js
@@ -2270,7 +2270,10 @@ $(document).ready(function() {
 
     'use strict';
 
-    document.querySelector('.MD-burger-icon').addEventListener(
+    var burger = document.querySelector('.MD-burger-icon');
+
+    if (burger !== null)
+    burger.addEventListener(
         'click',
         function() {
             var child;

diff --git a/source/js/js.min.js b/source/js/js.min.js