Bug: toc disappears after clicking on a toc item and toggling sidebar. #235, #261

Author: iissnan

.jshintrc

@@ -13,6 +13,8 @@
   "strict": false,
 
   "globals": {
-    "module": true
+    "$": true,
+    "window": true,
+    "document": true
   }
 }

_config.yml

@@ -1,85 +1,85 @@
-# when running hexo in a subdirectory (e.g. domain.tld/blog), remove leading slashes ( "/archives" -> "archives" )
-menu:
-  home: /
-  #categories: /categories
-  #about: /about
-  archives: /archives
-  tags: /tags
-  #commonweal: /404.html
-
-# Place your favicon.ico to /source directory.
-favicon: /favicon.ico
-
-# Set default keywords (Use a comma to separate)
-keywords: "Hexo,next"
-
-# Set rss to false to disable feed link.
-# Leave rss as empty to use site's feed link.
-# Set rss to specific value if you have burned your feed already.
-rss:
-
-# Icon fonts
-# Place your font into next/source/fonts, specify directory-name and font-name here
-# Avialable: default | linecons | fifty-shades | feather
-icon_font: default
-#icon_font: fifty-shades
-#icon_font: feather
-#icon_font: linecons
-
-# Code Highlight theme
-# Available value: normal | night | night eighties | night blue | night bright
-# https://github.com/chriskempson/tomorrow-theme
-highlight_theme: normal
-
-
-# MathJax Support
-mathjax:
-
-
-# Schemes
-#scheme: Mist
-
-
-# Sidebar, available value:
-#  - post    expand on posts automatically. Default.
-#  - always  expand for all pages automatically
-#  - hide    expand only when click on the sidebar toggle icon.
-sidebar: post
-#sidebar: always
-#sidebar: hide
-
-
-# Automatically scroll page to section which is under <!-- more --> mark.
-scroll_to_more: true
-
-
-# Automatically add list number to toc.
-toc_list_number: true
-
-# Automatically Excerpt
-auto_excerpt:
-  enable: false
-  length: 150
-
-# Use Lato font
-# Note: this option is avialable only when the language is not `zh-Hans`
-use_font_lato: true
-
-
-## DO NOT EDIT THE FOLLOWING SETTINGS
-## UNLESS YOU KNOW WHAT YOU ARE DOING
-
-# Use velocity to animate everything.
-use_motion: true
-
-# Fancybox
-fancybox: true
-
-# Static files
-vendors: vendors
-css: css
-js: js
-images: images
-
-# Theme version
-version: 0.4.3
+# when running hexo in a subdirectory (e.g. domain.tld/blog), remove leading slashes ( "/archives" -> "archives" )
+menu:
+  home: /
+  #categories: /categories
+  #about: /about
+  archives: /archives
+  tags: /tags
+  #commonweal: /404.html
+
+# Place your favicon.ico to /source directory.
+favicon: /favicon.ico
+
+# Set default keywords (Use a comma to separate)
+keywords: "Hexo,next"
+
+# Set rss to false to disable feed link.
+# Leave rss as empty to use site's feed link.
+# Set rss to specific value if you have burned your feed already.
+rss:
+
+# Icon fonts
+# Place your font into next/source/fonts, specify directory-name and font-name here
+# Avialable: default | linecons | fifty-shades | feather
+icon_font: default
+#icon_font: fifty-shades
+#icon_font: feather
+#icon_font: linecons
+
+# Code Highlight theme
+# Available value: normal | night | night eighties | night blue | night bright
+# https://github.com/chriskempson/tomorrow-theme
+highlight_theme: normal
+
+
+# MathJax Support
+mathjax:
+
+
+# Schemes
+#scheme: Mist
+
+
+# Sidebar, available value:
+#  - post    expand on posts automatically. Default.
+#  - always  expand for all pages automatically
+#  - hide    expand only when click on the sidebar toggle icon.
+sidebar: post
+#sidebar: always
+#sidebar: hide
+
+
+# Automatically scroll page to section which is under <!-- more --> mark.
+scroll_to_more: true
+
+
+# Automatically add list number to toc.
+toc_list_number: true
+
+# Automatically Excerpt
+auto_excerpt:
+  enable: false
+  length: 150
+
+# Use Lato font
+# Note: this option is avialable only when the language is not `zh-Hans`
+use_font_lato: true
+
+
+## DO NOT EDIT THE FOLLOWING SETTINGS
+## UNLESS YOU KNOW WHAT YOU ARE DOING
+
+# Use velocity to animate everything.
+use_motion: true
+
+# Fancybox
+fancybox: true
+
+# Static files
+vendors: vendors
+css: css
+js: js
+images: images
+
+# Theme version
+version: 0.4.3.1

layout/_scripts/pages/post-details.swig

@@ -31,7 +31,6 @@
     }
 
     function getTOCMaxHeight () {
-      var $sidebarInner = $('.sidebar-inner');
       var height = $('.sidebar').height() -
                    $tocSelector.position().top -
                    $('.post-toc-indicator-bottom').height();
@@ -53,7 +52,7 @@
       )
     }
 
-    $(document).on('sidebar.didShow', function () {
+    $(document).on('sidebar.motion.complete', function () {
       processTOC();
     });
 

source/js/motion_global.js

@@ -35,7 +35,7 @@ $(document).ready(function () {
 
 
   //当前选择的是目录列表时添加 class 'motion-element'
-  sidebar.bind('click', function(e){ 
+  sidebar.bind('click', function(e){
     if(!!$('.sidebar-nav-toc') && e.target == $('.sidebar-nav-toc')[0]){
       $('.post-toc-wrap').addClass('motion-element');
     }});
@@ -55,7 +55,7 @@ $(document).ready(function () {
         SIDEBAR_DISPLAY_DURATION
       );
       // sidebar 内容的效果应该在sidebarsidebarShowMotion内触发
-      // sidebarContentMotion(); 
+      // sidebarContentMotion();
     })
     .on('sidebar.isHiding', function () {});
 
@@ -134,9 +134,14 @@ $(document).ready(function () {
   }
 
   function sidebarContentMotion () {
-    $('.sidebar .motion-element').velocity(
-      'transition.slideRightIn',
-      {stagger: 50, drag: true}
+    $('.sidebar .motion-element')
+      .velocity('transition.slideRightIn',{
+        stagger: 50,
+        drag: true,
+        complete: function () {
+          sidebar.trigger('sidebar.motion.complete');
+        }
+      }
     );
   }