hexo-theme-volantis 5.0.0-rc.9 → 5.1.0

package/layout/_partial/scripts/global.ejs

@@ -35,7 +35,7 @@
         layout: <%- JSON.stringify(theme.rightmenu.layout) %>,
         music_alwaysShow: <%- JSON.stringify(theme.rightmenu.music.alwaysShow) %>,
         customPicUrl: <%- JSON.stringify(theme.rightmenu.customPicUrl) %>
-      },      
+      },
       rightmenus: <%- JSON.stringify(theme.rightmenus) %>
     }
   }
@@ -181,12 +181,21 @@
     error: new RunItem(),
     send: new RunItem(),
   };
-  volantis.pjax = {
-    ...volantis.pjax,
+  volantis.pjax = Object.assign(volantis.pjax, {
     push: volantis.pjax.method.complete.push,
     error: volantis.pjax.method.error.push,
     send: volantis.pjax.method.send.push,
-  };
+  });
+  /******************** RightMenu ********************************/
+  // volantis.rightmenu.handle(callBack[,"callBackName"]) 外部菜单项控制
+  // 可在 volantis.mouseEvent 处获取右键事件
+  volantis.rightmenu = {};
+  volantis.rightmenu.method = {
+    handle: new RunItem(),
+  }
+  volantis.rightmenu = Object.assign(volantis.rightmenu, {
+    handle: volantis.rightmenu.method.handle.push,
+  });
   /********************  Dark Mode  ********************************/
   // /layout/_partial/scripts/darkmode.ejs
   // volantis.dark.mode 当前模式 dark or light
@@ -196,10 +205,9 @@
   volantis.dark.method = {
     toggle: new RunItem(),
   };
-  volantis.dark = {
-    ...volantis.dark,
+  volantis.dark = Object.assign(volantis.dark, {
     push: volantis.dark.method.toggle.push,
-  };
+  });
   /********************  Message  ********************************/
   // VolantisApp.message
   /********************  isMobile  ********************************/
@@ -309,10 +317,9 @@
     engine: new RunItem(),
     unengine: new RunItem(),
   };
-  volantis.scroll = {
-    ...volantis.scroll,
+  volantis.scroll = Object.assign(volantis.scroll, {
     push: volantis.scroll.engine.push,
-  };
+  });
   // 滚动条距离顶部的距离
   volantis.scroll.getScrollTop = () =>{
     let scrollPos;
@@ -339,6 +346,8 @@
         // } else {
         //   console.log("向上滚动");
         // }
+        // 注销过期的unengine未滚动事件
+        volantis.scroll.unengine.list=[]
         volantis.scroll.engine.start();
       }else{
         volantis.scroll.unengine.start();
@@ -366,24 +375,39 @@
       opt.top += option.addTop
     }
     if (!("observerDic" in option)) {
-      option.observerDic = 25
+      option.observerDic = 100
     }
     // 滚动
     window.scrollTo(opt);
     // 监视器
-    // 监视并矫正元素滚动到指定位置 
-    // 目前用于处理 toc 部分 lazyload 引起的 cls 导致的定位失败问题 [存在Bug]
-    // if (option.observer) {
-    //   volantis.scroll.unengine.push(()=>{
-    //     let me = ele.getBoundingClientRect().top
-    //     if(!(me >= -option.observerDic && me <= option.observerDic)){
-    //       volantis.scroll.to(ele, option)
-    //     }else{
-    //       volantis.scroll.unengine.remove("unengineObserver")
-    //     }
-    //   },"unengineObserver")
-    // }
+    // 监视并矫正元素滚动到指定位置
+    // 用于处理 lazyload 引起的 cls 导致的定位失败问题
+    // option.observer = false
+    if (option.observer) {
+      setTimeout(()=>{
+        volantis.scroll.unengine.push(()=>{
+          let me = ele.getBoundingClientRect().top
+          if(!(me >= -option.observerDic && me <= option.observerDic)){
+            volantis.scroll.to(ele, option)
+          }
+          volantis.scroll.unengine.remove("unengineObserver")
+        },"unengineObserver")
+      },1000)
+    }
   }
+  /********************** Content Visibility ********************************/
+  // 见 source/css/first.styl 如果遇到任何问题 删除 .post-story 即可
+  // 一个元素被声明 content-visibility 属性后 如果元素不在 viewport 中 浏览器不会计算其后代元素样式和属性 从而节省 Style & Layout 耗时
+  // content-visibility 的副作用: 锚点失效 等等(实验初期 暂不明确), 使用此方法清除样式
+  volantis.cleanContentVisibility = ()=>{
+    if (document.querySelector(".post-story")) {
+      console.log("cleanContentVisibility");
+      document.querySelectorAll(".post-story").forEach(e=>{
+        e.classList.remove("post-story")
+      })
+    }
+  }
+  /******************************************************************************/
   /******************************************************************************/
   /******************************************************************************/
   //图像加载出错时的处理

package/layout/_partial/scripts/index.ejs

@@ -64,9 +64,27 @@
   <%- partial('../../_plugins/aplayer/script') %>
 <% } %>
 
-<% if (theme.comments.service && theme.comments.service.length > 0) { %>
-  <%- partial('../../_plugins/comments/' + theme.comments.service + '/script') %>
-<% } %>
+<%
+  if (theme.comments.service && theme.comments.service.length > 0) {
+    try { %>
+      <%- partial('../../_plugins/comments/' + theme.comments.service + '/script') %>
+    <% } catch (e) {
+      // error friendly
+      console.log(`
+===============================================================================
+    没有找到评论插件：${theme.comments.service}
+    请检查是否存在该插件，或者检查插件名称是否正确：${theme.comments.service}
+    see: https://volantis.js.org/v5/theme-settings/#选择评论系统
+================================================================================
+    There is no comments plugin: ${theme.comments.service}
+    Please check if the plugin exists, or check the plugin name is correct: ${theme.comments.service}
+    see: https://volantis.js.org/v5/theme-settings/#选择评论系统
+=================================================================================`)
+    }
+  }
+%>
+
+
 
 <% if (theme.analytics.busuanzi) { %>
   <script defer src="<%- theme.analytics.busuanzi %>" data-pjax></script>
@@ -93,7 +111,7 @@
   <%- partial('../../_plugins/analytics/LCCounter') %>
 <% } %>
 
-<% if (config.google_analytics_key || config.baidu_analytics_key || config.tencent_aegis_id) { %>
+<% if (config.google_analytics_key || config.baidu_analytics_key || config.tencent_aegis_id || config.v6_51_la) { %>
   <%- partial('../../_plugins/analytics/script') %>
 <% } %>
 
@@ -124,8 +142,3 @@
   <%- structured_data() %>
 <% } %>
 
-<!-- more -->
-<% if (config.import && config.import.script) { %>
-  <%- partial('import') %>
-<% } %>
-

package/layout/_partial/scripts/toc.ejs

@@ -2,11 +2,13 @@
   function listennSidebarTOC() {
     const navItems = document.querySelectorAll(".toc li");
     if (!navItems.length) return;
+    let targets = []
     const sections = [...navItems].map((element) => {
       const link = element.querySelector(".toc-link");
       const target = document.getElementById(
         decodeURI(link.getAttribute("href")).replace("#", "")
       );
+      targets.push(target)
       // 解除 a 标签 href 的 锚点定位, a 标签 href 的 锚点定位 会随机启用?? 产生错位???
       link.setAttribute("onclick","return false;")
       link.setAttribute("toc-action","toc-"+decodeURI(link.getAttribute("href")).replace("#", ""))
@@ -15,7 +17,7 @@
       link.addEventListener("click", (event) => {
         event.preventDefault();
         // 这里的 addTop 是通过错位使得 toc 自动展开.
-        volantis.scroll.to(target,{addTop: 5, observer:false})
+        volantis.scroll.to(target,{addTop: 5, observer:true})
         // Anchor id
         history.pushState(null, document.title, "#" + target.id);
       });
@@ -36,46 +38,67 @@
       }
     }
 
-    function findIndex(entries) {
-      let index = 0;
-      let entry = entries[index];
-      if (entry.boundingClientRect.top > 0) {
-        index = sections.indexOf(entry.target);
-        return index === 0 ? 0 : index - 1;
-      }
-      for (; index < entries.length; index++) {
-        if (entries[index].boundingClientRect.top <= 0) {
-          entry = entries[index];
-        } else {
-          return sections.indexOf(entry.target);
-        }
-      }
-      return sections.indexOf(entry.target);
-    }
-
-    function createIntersectionObserver(marginTop) {
-      marginTop = Math.floor(marginTop + 10000);
-      let intersectionObserver = new IntersectionObserver(
-        (entries, observe) => {
-          let scrollHeight = document.documentElement.scrollHeight;
-          if (scrollHeight > marginTop) {
-            observe.disconnect();
-            createIntersectionObserver(scrollHeight);
-            return;
+    // 方案一：
+    volantis.activateNavIndex=0
+    activateNavByIndex(navItems[volantis.activateNavIndex])
+    volantis.scroll.push(()=>{
+      if (targets[0].getBoundingClientRect().top >= 0) {
+        volantis.activateNavIndex = 0
+      }else if (targets[targets.length-1].getBoundingClientRect().top < 0) {
+        volantis.activateNavIndex = targets.length-1
+      } else {
+        for (let index = 0; index < targets.length; index++) {
+          const target0 = targets[index];
+          const target1 = targets[(index+1)%targets.length];
+          if (target0.getBoundingClientRect().top < 0&&target1.getBoundingClientRect().top >= 0) {
+            volantis.activateNavIndex=index
+            break;
           }
-          let index = findIndex(entries);
-          activateNavByIndex(navItems[index]);
-        }, {
-          rootMargin: marginTop + "px 0px -100% 0px",
-          threshold: 0,
         }
-      );
-      sections.forEach((element) => {
-        element && intersectionObserver.observe(element);
-      });
-    }
+      }
+      activateNavByIndex(navItems[volantis.activateNavIndex])
+    })
 
-    createIntersectionObserver(document.documentElement.scrollHeight);
+    // 方案二：
+    // IntersectionObserver 不是完美精确到像素级别 也不是低延时性的
+    // function findIndex(entries) {
+    //   let index = 0;
+    //   let entry = entries[index];
+    //   if (entry.boundingClientRect.top > 0) {
+    //     index = sections.indexOf(entry.target);
+    //     return index === 0 ? 0 : index - 1;
+    //   }
+    //   for (; index < entries.length; index++) {
+    //     if (entries[index].boundingClientRect.top <= 0) {
+    //       entry = entries[index];
+    //     } else {
+    //       return sections.indexOf(entry.target);
+    //     }
+    //   }
+    //   return sections.indexOf(entry.target);
+    // }
+    // function createIntersectionObserver(marginTop) {
+    //   marginTop = Math.floor(marginTop + 10000);
+    //   let intersectionObserver = new IntersectionObserver(
+    //     (entries, observe) => {
+    //       let scrollHeight = document.documentElement.scrollHeight;
+    //       if (scrollHeight > marginTop) {
+    //         observe.disconnect();
+    //         createIntersectionObserver(scrollHeight);
+    //         return;
+    //       }
+    //       let index = findIndex(entries);
+    //       activateNavByIndex(navItems[index]);
+    //     }, {
+    //       rootMargin: marginTop + "px 0px -100% 0px",
+    //       threshold: 0,
+    //     }
+    //   );
+    //   sections.forEach((element) => {
+    //     element && intersectionObserver.observe(element);
+    //   });
+    // }
+    // createIntersectionObserver(document.documentElement.scrollHeight);
   }
 
   document.addEventListener("DOMContentLoaded", ()=>{

package/layout/_plugins/_page_plugins/indent/index.ejs

@@ -9,7 +9,7 @@
   #post-body blockquote p,
   #post-body details p,
   #post-body p.p,
-  #post-body .tab-pane .checkbox 
+  #post-body .tab-pane .checkbox
   #post-body section p {
     text-indent: initial;
   }

package/layout/_plugins/_page_plugins/index.ejs

@@ -1,7 +1,27 @@
-<%_(page.plugins||[]).forEach(function(item){  _%>
-  <%_if (typeof item == "string") {   _%>
-    <%- partial( item + "/index") %>
-  <%_}else if(typeof item == "object"){  _%>
-    <%- partial( Object.keys(item)[0] + "/index", { pagePlugin:item }) %>
-  <%_} _%>
-<%_ }) _%>
+<%_
+(page.plugins||[]).forEach(function(item){
+  try {
+      if (typeof item == "string") { _%>
+        <%- partial( item + "/index") %>
+<%_   }else if(typeof item == "object"){    _%>
+      <%- partial( Object.keys(item)[0] + "/index", { pagePlugin:item }) %>
+<%_   }
+  } catch (error) {
+    // error friendly
+    console.log(`
+===============================================================================
+    没有找到页面插件：${item}
+    请检查是否存在该插件，或者检查插件名称是否正确：${item}
+    出问题的页面：${page.path}
+    see: https://volantis.js.org/v5/page-settings/#页面插件-page-plugins
+================================================================================
+    There is no page plugin: ${item}
+    Please check if the plugin exists, or check the plugin name is correct: ${item}
+    The page that has problem: ${page.path}
+    see: https://volantis.js.org/v5/page-settings/#页面插件-page-plugins
+=================================================================================`);
+  }
+
+})
+
+_%>

package/layout/_plugins/_page_plugins/snackbar/index.ejs

@@ -1,4 +1,4 @@
-<% if (site.data.notification && (pagePlugin.snackbar in site.data.notification)) { %> 
+<% if (site.data.notification && (pagePlugin.snackbar in site.data.notification)) { %>
 <% let snackbar = site.data.notification[pagePlugin.snackbar] %>
 <% if (snackbar.position == 'bottom') { %>
   <div id="snackbar"></div>

package/layout/_plugins/analytics/script.ejs

@@ -35,6 +35,7 @@ var _hmt = _hmt || [];
 volantis.pjax.push(()=>{_hmt.push(['_trackPageview', document.location.pathname]);},'baidu_analytics')
 </script>
 <% } %>
+
 <% if (config.tencent_aegis_id) { %>
 <script>
   const genUuid = () => {
@@ -61,4 +62,13 @@ volantis.pjax.push(()=>{_hmt.push(['_trackPageview', document.location.pathname]
   }, 1000)
 </script>
 <% } %>
-		
+
+<% if (config.v6_51_la) { %>
+  <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
+  <script>
+    volantis.js("https://sdk.51.la/js-sdk-pro.min.js").then(() => {
+      LA.init({id: "<%= config.v6_51_la %>",ck: "<%= config.v6_51_la %>",autoTrack:true,hashMode:true})
+    })
+  </script>
+<% } %>
+  

package/layout/_plugins/aplayer/script.ejs

@@ -25,7 +25,7 @@
             Metings.forEach((item, index) => {
               const aplayerItem = item.aplayer; if(!aplayerItem) return;
               const rightAplayerCheck = '<%= theme.rightmenu.layout.includes("music") %>' === 'true'
-                && item.meta.id === '<%= theme.plugins.aplayer.id %>'; 
+                && item.meta.id === '<%= theme.plugins.aplayer.id %>';
               if(rightAplayerCheck) RightMenuAplayer.checkAPlayer();
               if(aplayerItem.events.events.play.every(item => {return item.name !== 'messagePlay'})) {
                 aplayerItem.on('play', function messagePlay() {

package/layout/_plugins/comments/artalk/script.ejs

@@ -19,20 +19,24 @@
       pageKey: path,
       pageTitle: document.title,
       placeholder: placeholder,
+      useBackendConf: true,
       site: '<%= config.title %>',
-      darkMode: volantis.dark.mode === "dark"
+      darkMode: volantis.dark.mode === "dark",
+      pvEl: '#artalk_visitors'
     }));
 
-    volantis.artalk.on('comments-loaded', () => {
-      if (typeof VolantisFancyBox === "undefined"){
-        const checkFancyBox = setInterval(() => {
-          if(typeof VolantisFancyBox === "undefined") return;
-          clearInterval(checkFancyBox);
+    volantis.artalk.then(ctx => {
+      ctx.on('comments-loaded', () => {
+        if (typeof VolantisFancyBox === "undefined"){
+          const checkFancyBox = setInterval(() => {
+            if(typeof VolantisFancyBox === "undefined") return;
+            clearInterval(checkFancyBox);
+            VolantisFancyBox.groupBind('.atk-content img:not([atk-emoticon])', 'Comments');
+          })
+        } else {
           VolantisFancyBox.groupBind('.atk-content img:not([atk-emoticon])', 'Comments');
-        })
-      } else {
-        VolantisFancyBox.groupBind('.atk-content img:not([atk-emoticon])', 'Comments');
-      }
+        }
+      })
     })
   }
 
@@ -47,7 +51,9 @@
 
   function dark_artalk() {
     if(!document.querySelectorAll("#artalk_container")[0]) return;
-    volantis.artalk.setDarkMode(volantis.dark.mode === "dark")
+    volantis.artalk.then(ctx => {
+      ctx.setDarkMode(volantis.dark.mode === "dark")
+    })
   }
   volantis.dark.push(dark_artalk);
 </script>

package/layout/_plugins/comments/beaudar/script.ejs

@@ -46,14 +46,14 @@
     const beaudarIframe = document.querySelector('iframe');
     beaudarIframe.contentWindow.postMessage(message, 'https://beaudar.lipk.org');
   }
-  
+
   function check_beaudar_style() {
     // Beaudar 会往 HEAD 的首节点追加样式元素，而这个追加没有添加判断
     // 所以 Pjax 下会多次添加样式文件，略微麻烦。
     const checkStyle = document.querySelector('head').firstElementChild;
     if(checkStyle.innerText.includes('beaudar')) checkStyle.remove();
   }
-  
+
   pjax_beaudar();
   volantis.pjax.push(check_beaudar_style);
   volantis.pjax.push(pjax_beaudar);

package/layout/_plugins/comments/discuss/script.ejs

@@ -0,0 +1,30 @@
+<script>
+  volantis.layoutHelper("comments",`<div id="discuss_container"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`)
+  function load_discuss() {
+    if(!document.querySelectorAll("#discuss_container")[0])return;
+    volantis.js("<%- theme.comments.discuss.js %>", pjax_discuss)
+  }
+  function pjax_discuss() {
+    if(!document.querySelectorAll("#discuss_container")[0])return;
+    let path = pdata.commentPath;
+    let placeholder = pdata.commentPlaceholder || "<%= theme.comments.discuss.ph %>" || "";
+    if (path.length == 0) {
+      let defaultPath = '<%= theme.comments.discuss.path %>';
+      path = defaultPath || decodeURI(window.location.pathname);
+    }
+
+    Discuss.init(Object.assign(Object.assign(<%- JSON.stringify(theme.comments.discuss) %>, {
+      el: '#discuss_container',
+      path: path,
+      ph: placeholder
+    }),pdata.commentConfig))
+  }
+  load_discuss();
+  volantis.pjax.push(()=>{
+    if (typeof Discuss == "undefined") {
+      load_discuss();
+    } else {
+      pjax_discuss();
+    }
+  },'discuss');
+</script>

package/layout/_plugins/comments/hashover/script.ejs

@@ -1,5 +1,5 @@
 <script>
   volantis.layoutHelper("comments",`<p>未注册者输入用户名和密码登录即相当于注册，之后以同一用户名和密码登录可以编辑自己之前的评论。留邮箱可接收回复通知。支持全匿名评论。</p>
   <div id="hashover"></div>`)
-</script> 
-<script data-pjax type="text/javascript" src="<%= theme.comments.hashover.src %>"></script> 
+</script>
+<script data-pjax type="text/javascript" src="<%= theme.comments.hashover.src %>"></script>

package/layout/_plugins/comments/index.ejs

@@ -5,8 +5,8 @@
     }
 %>
 <% if (checkComment&&(theme.comments.service && theme.comments.service.length > 0)) { %>
-  
-  <article class="post white-box reveal <%- theme.custom_css.body.effect.join(' ') %>" id="comments">
+
+  <article class="post white-box <%- theme.custom_css.body.effect.join(' ') %>" id="comments">
     <span hidden>
       <meta itemprop="discussionUrl" content="<%- url_for(path) %>#comments">
     </span>
@@ -14,11 +14,11 @@
     <% if (theme.comments && theme.comments.subtitle) { %>
       <p cst><%- theme.comments.subtitle %></p>
     <% } %>
-    
+
     <div id="layoutHelper-comments"></div>
 
   </article>
-  
+
 <% } else { %>
   <% page.comments = false; %>
 <% } %>

package/layout/_plugins/comments/twikoo/script.ejs

@@ -10,7 +10,7 @@
     let placeholder = pdata.commentPlaceholder || "<%= theme.comments.twikoo.placeholder %>" || "";
     if (path.length == 0) {
       let defaultPath = '<%= theme.comments.twikoo.path %>';
-      path = defaultPath || "decodeURI(window.location.pathname)"; //神奇的pathname 没错,twikoo这里就是字符串,不要乱动了
+      path = defaultPath || decodeURI(window.location.pathname);
     }
     twikoo.init(Object.assign(Object.assign(<%- JSON.stringify(theme.comments.twikoo) %>, {
       el: '#twikoo_container',

package/layout/_plugins/comments/waline/script.ejs

@@ -1,44 +1,62 @@
 <script>
   volantis.layoutHelper("comments",`<div id="waline"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`)
+  
   function pjax_waline() {
     if(!document.querySelector("#waline"))return;
-    let pagePlaceholder = pdata.commentPlaceholder || "<%= theme.comments.waline.placeholder %>";
+    let locale = {};
     let path = pdata.commentPath;
+    let pagePlaceholder = pdata.commentPlaceholder || "<%= theme.comments.waline.placeholder %>";
     if (path.length == 0) {
       let defaultPath = '<%= theme.comments.waline.path %>';
       path = defaultPath || decodeURI(window.location.pathname);
     }
-    new Waline(Object.assign(Object.assign(<%- JSON.stringify(theme.comments.waline) %>, {
-      el: '#waline',
-      path: path,
-      placeholder: pagePlaceholder,
-      
-      // https://github.com/volantis-x/hexo-theme-volantis/issues/713
-      <% if(theme.comments.waline.imageHosting){ %>
-        uploadImage: function(file) {
-          const formData = new FormData();
-          formData.append('image', file);
-          return fetch('<%= theme.comments.waline.imageHosting %>', {
-            method: 'POST',
-          body: formData
-          }).then(resp => resp.json()).then(resp => resp.data.url);
-        }
-      <% } %>
-  
-  }),pdata.commentConfig));
+    if(pagePlaceholder.length != 0) {
+      locale.placeholder = pagePlaceholder;
+    }
+
+    try {
+      Waline.init(Object.assign(Object.assign(<%- JSON.stringify(theme.comments.waline) %>, {
+        el: '#waline',
+        path: path,
+        // https://github.com/volantis-x/hexo-theme-volantis/issues/713
+        <% if(!!theme.comments.waline.imageUploader?.api){ %>
+          imageUploader: function(file) {
+            let headers = new Headers();
+            headers.set('Accept', 'application/json');
+            <% if(!!theme.comments.waline.imageUploader?.token) { %>
+              headers.set('Authorization', '<%= theme.comments.waline.imageUploader?.token %>')
+            <% } %>
+            let formData = new FormData();
+            formData.append('file', file);
+            return fetch('<%= theme.comments.waline.imageUploader?.api %>',{
+              method: 'POST',
+              body: formData,
+              headers: headers
+              }).then((resp) => resp.json())
+                .then((resp) => resp.<%= theme.comments.waline.imageUploader?.resp %>)
+          },
+        <% } %>
+        locale,
+      }),pdata.commentConfig));
+    } catch (error) {
+      alert(`Waline ${error}`)
+    }
     fancybox_waline()
   }
+
   function fancybox_waline() {
     if(typeof VolantisFancyBox === "undefined") {
       const checkFancyBox = setInterval(() => {
         if(typeof VolantisFancyBox === "undefined") return;
         clearInterval(checkFancyBox);
-        VolantisFancyBox.bind('#waline .vcontent img:not(.vemoji)');
+        VolantisFancyBox.bind('#waline .wl-content img:not(.wl-emoji)');
       })
     } else {
-      VolantisFancyBox.bind('#waline .vcontent img:not(.vemoji)');
+      VolantisFancyBox.bind('#waline .wl-content img:not(.wl-emoji)');
     }
   }
+
+  volantis.css('<%= theme.comments.waline.css %>')
   volantis.js('<%- theme.comments.waline.js %>').then(pjax_waline)
   volantis.pjax.push(pjax_waline);
-</script>
+</script>

package/layout/_plugins/parallax/script.ejs

@@ -1,5 +1,5 @@
 <%_
-theme.plugins.parallax.images = theme.plugins.parallax.images || page.images; 
+theme.plugins.parallax.images = theme.plugins.parallax.images || page.images;
 if (theme.plugins.parallax.shuffle) {
   // shuffle 只一次 防止 hash 变化
   if (typeof theme.plugins.parallax.shuffle_end==='undefined') {

package/layout/_plugins/pjax/index.ejs

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   pjax重载区域接口：
   1.  <pjax></pjax> 标签 pjax 标签必须存在于所有页面 否则 pjax error
   2.  script[data-pjax]
@@ -19,6 +19,9 @@
       pjax = new Pjax({
         elements: 'a[href]:not([href^="#"]):not([href="javascript:void(0)"]):not([pjax-fancybox]):not([onclick="return false;"]):not([onclick="return!1"]):not([target="_blank"]):not([target="view_window"]):not([href$=".xml"])',
         selectors: [
+          "head title",
+          "head meta[name=keywords]",
+          "head meta[name=description]",
           <% if (!theme.plugins.pjax.cover){ %>"#l_cover",<% } %>
           "#l_main",
           "#pjax-header-nav-list",

package/layout/_plugins/rightmenu/layout.ejs

@@ -80,13 +80,13 @@
             <span class='vlts-menu opt fix-cursor-default' id='printHtml'>
               <i class='<%= theme.rightmenu.print.icon %> fa-fw '></i> <%- trim(theme.rightmenu.print.name) %>
             </span>
-          </li>  
+          </li>
         <% } else if (item == 'reading') { %>
           <li class='option menuOption-Content'>
             <span class='vlts-menu opt fix-cursor-default' id='readingModel'>
               <i class='<%= theme.rightmenu.reading.icon %> fa-fw '></i> <%- trim(theme.rightmenu.reading.name) %>
             </span>
-          </li>  
+          </li>
         <% } else if (item == 'music' && theme.plugins.aplayer.enable == true) { %>
           <div id="menuMusic">
             <li class='music name menuOption-Content'>