hexo-theme-solitude 3.0.20 → 4.0.0

package/layout/includes/widgets/post/postInfo.pug

@@ -16,6 +16,10 @@
     h1.post-title= page.title
     #post-meta
         .meta-secondline
+            if theme.wordcount && theme.post.meta.wordcount
+                span.post-meta-wordcount
+                    i.post-meta-icon.solitude.fas.fa-file-word(title=_p('post.wordcount'))
+                    span.word-count= wordcount(page.content)
             if theme.post.meta.date
                 span.post-meta-date(title=_p('post.posted') + ' ' + full_date(page.date))
                     i.post-meta-icon.solitude.fas.fa-calendar-days
@@ -24,15 +28,10 @@
                 span.post-meta-date(title=_p('post.updated') + ' ' + full_date(page.updated))
                     i.post-meta-icon.solitude.fas.fa-arrows-rotate
                     time(datetime=date_xml(page.updated))= date_xml(page.updated)
-            if theme.wordcount
-                span.post-meta-wordcount
-                    if theme.post.meta.wordcount
-                        i.post-meta-icon.solitude.fas.fa-file-word(title=_p('post.wordcount'))
-                        span.word-count= wordcount(page.content)
-                    span.post-meta-separator
-                    if theme.post.meta.readtime
-                        i.post-meta-icon.solitude.fas.fa-clock(title=_p('post.minread'))
-                        span= min2read(page.content) + ' ' + _p('post.min')
+            if theme.wordcount && theme.post.meta.readtime
+                span.post-meta-readtime
+                    i.post-meta-icon.solitude.fas.fa-clock(title=_p('post.minread'))
+                    span= min2read(page.content) + ' ' + _p('post.min')
             if theme.post.meta.locate
                 span.post-meta-position(title=_p('post.ip') + page.locate)
                     i.post-meta-icon.solitude.fas.fa-location-dot
@@ -64,7 +63,7 @@
                                 span#busuanzi_page_pv
                                     i.solitude.fas.fa-spinner.fa-spin
             if theme.post.meta.comment && page.comment && theme.comment.count && theme.comment.use
-                span.post-meta-commentcount(title=_p('post.comment'), onclick="sco.scrollTo('post-comment')")
+                span.post-meta-commentcount(title=_p('post.comment') data-solitude-action="scrollTo" data-solitude-target="post-comment")
                     i.solitude.fas.fa-comment
                     a(href=url_for(page.path) + "#post-comment")
                         case theme.comment.use[0]
@@ -80,4 +79,4 @@
                             when 'Artalk'
                                 span.artalk-comment-count
                                     i.solitude.fas.fa-spinner.fa-spin
-.post-radius-bottom
+.post-radius-bottom

package/layout/includes/widgets/post/postMeta.pug

@@ -1,3 +1,4 @@
-.coverdiv#coverdiv
-    img#post-cover.nolazyload(src=url_for(page.cover), alt=page.title)
+.post-cover-aside
+    a.post-cover-aside-link.fancybox(href=url_for(page.cover), target="_blank", rel="noopener", data-fancybox="images", data-caption=page.title, aria-label=page.title)
+        img#post-cover.post-cover-aside-img.nolazyload(src=url_for(page.cover), alt=page.title)
 include ./postInfo

package/layout/includes/widgets/rightside/hide.pug

@@ -1,12 +1,12 @@
 .rs_hide
     if theme.rightside.hide.translate
-        button.translate(type='button' title=_p('rightside.hide.translate'))= '简'
+        button.translate(type='button' title=_p('rightside.hide.translate') heotip=_p('rightside.hide.translate'))= '简'
     if theme.rightside.hide.mode 
-        button.mode(type='button' title=_p('rightside.hide.mode') onclick='sco.switchDarkMode()')
+        button.mode(type='button' title=_p('rightside.hide.mode') heotip=_p('rightside.hide.mode') data-solitude-action='toggleTheme')
             i.fas.fa-circle-half-stroke
     if theme.rightside.hide.aside && theme.console.enable
-        button.aside.pc(type='button' title=_p('rightside.hide.aside') onclick='sco.switchHideAside()')
+        button.aside.pc(type='button' title=_p('rightside.hide.aside') heotip=_p('rightside.hide.aside') data-solitude-action='switchHideAside')
             i.fas.fa-arrows-alt-h
     if theme.keyboard.enable
-        button.keyboard.pc(type='button' title=_p('console.switch_keyboard') onclick="sco.switchKeyboard()")
-            i.fas.fa-keyboard
+        button.keyboard.pc(type='button' title=_p('console.switch_keyboard') heotip=_p('console.switch_keyboard') data-solitude-action='switchKeyboard')
+            i.fas.fa-keyboard

package/layout/includes/widgets/rightside/show.pug

@@ -1,16 +1,16 @@
 .rs_show
     if theme.rightside.hide.enable
-        button.config(type='button' title=_p('rightside.show.gear') onclick='document.querySelector(".rs_hide").classList.toggle("show")')
-            i.fas.fa-gear.fa-spin
+        button.config(type='button' title=_p('rightside.show.gear') heotip=_p('rightside.show.gear') data-solitude-action='toggleTargetClass' data-solitude-target='.rs_hide')
+            i.fas.fa-gear
     if showToc
-        button.mobile.toc(type='button' title=_p('rightside.show.toc') onclick="document.querySelector('#card-toc').classList.toggle('open')")
+        button.mobile.toc(type='button' title=_p('rightside.show.toc') heotip=_p('rightside.show.toc') data-solitude-action='toggleTargetClass' data-solitude-target='#card-toc' data-solitude-class='open')
             i.fas.fa-list
     if page.comment
-        button.comment(type='button' title=_p('rightside.show.comment') onclick="sco.scrollTo('post-comment')")
+        button.comment(type='button' title=_p('rightside.show.comment') heotip=_p('rightside.show.comment') data-solitude-action='scrollTo' data-solitude-target='post-comment')
             i.fas.fa-comment
     if theme.comment.commentBarrage && page.comment
-        button.barrage.pc(type='button' title=_p('rightside.show.barrage') onclick="sco.switchCommentBarrage()")
+        button.barrage.pc(type='button' title=_p('rightside.show.barrage') heotip=_p('rightside.show.barrage') data-solitude-action='switchCommentBarrage')
             span= _p('rightside.show.barrage')
-    button.top(type='button' title=_p('rightside.show.top') onclick='sco.toTop()')
+    button.top(type='button' title=_p('rightside.show.top') heotip=_p('rightside.show.top') data-solitude-action='toTop')
         i.fas.fa-arrow-up
-        span#percent= "0"
+        span#percent= "0"

package/layout/includes/widgets/third-party/comments/artalk.pug

@@ -12,7 +12,7 @@ script.
                 pageKey: location.pathname,
                 darkMode: document.documentElement.getAttribute('data-theme') === 'dark'
             }, !{JSON.stringify(option)})
-            if (GLOBAL_CONFIG.lightbox === 'null') return
+            if (Solitude.config.lightbox === 'null') return
             artalkItem.on('list-loaded', () => {
                 const array = []
                 artalkItem.ctx.get('list').getCommentNodes().forEach(comment => {
@@ -22,13 +22,13 @@ script.
                         mailMd5: comment.data.email_encrypted,
                     })
                     const $content = comment.getRender().$content
-                    GLOBAL_CONFIG.lightbox && utils.lightbox($content.querySelectorAll('img:not([atk-emoticon])'))
+                    Solitude.config.lightbox && Solitude.lightbox($content.querySelectorAll('img:not([atk-emoticon])'))
                 })
-                sco.owoBig({body: '.atk-grp', item: '.atk-item'})
+                Solitude.owoBig({body: '.atk-grp', item: '.atk-item'})
                 !{commentBarrage} && barrageArtalk(array)
             })
             const destroyArtalk = () => artalkItem.destroy()
-            utils.addGlobalFn('pjax', destroyArtalk, 'destroyArtalk')
+            Solitude.addGlobalFn('pjax', destroyArtalk, 'destroyArtalk')
             document.addEventListener('pjax:complete', function () {
                 artalkItem.update({
                     pageKey: window.location.pathname,
@@ -40,8 +40,8 @@ script.
         const loadArtalk = async () => {
             if (typeof Artalk === 'object') initArtalk()
             else {
-                await utils.getCSS('!{theme.cdn.artalk_css}')
-                await utils.getScript('!{theme.cdn.artalk_js}').then(initArtalk)
+                await Solitude.getCSS('!{theme.cdn.artalk_css}')
+                await Solitude.getScript('!{theme.cdn.artalk_js}').then(initArtalk)
             }
         }
         const artalkChangeMode = theme => {
@@ -50,9 +50,9 @@ script.
             const isDark = theme === 'dark'
             artalkItem.setDarkMode(isDark)
         }
-        utils.addGlobalFn('themeChange', artalkChangeMode, 'artalk')
+        Solitude.addGlobalFn('themeChange', artalkChangeMode, 'artalk')
         if ('!{use[0]}' === 'Artalk' || !{lazyload}) {
-            if (!{lazyload}) utils.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
+            if (!{lazyload}) Solitude.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
             else loadArtalk()
         } else {
             window.loadTwoComment = loadArtalk
@@ -63,6 +63,6 @@ if commentBarrage
     script.
         async function barrageArtalk(array) {
             const init = () => initializeCommentBarrage(array)
-            if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+            if (typeof initializeCommentBarrage === "undefined") await Solitude.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
             else init()
         }

package/layout/includes/widgets/third-party/comments/giscus.pug

@@ -43,13 +43,13 @@ script.
             });
         }
 
-        utils.addGlobalFn('themeChange', changeGiscusTheme, 'giscus')
+        Solitude.addGlobalFn('themeChange', changeGiscusTheme, 'giscus')
 
         if ('!{use[0]}' === 'Giscus' || !!{lazyload}) {
             if (!{lazyload}) {
                 const giscusWrap = document.getElementById('giscus-wrap')
                 if (giscusWrap) {
-                    utils.loadComment(giscusWrap, loadGiscus)
+                    Solitude.loadComment(giscusWrap, loadGiscus)
                 }
             } else {
                 loadGiscus()

package/layout/includes/widgets/third-party/comments/twikoo.pug

@@ -24,12 +24,12 @@ script().
                 region: '!{region}',
                 path: window.location.pathname,
                 onCommentLoaded: () => {
-                    GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
+                    Solitude.config.lightbox && Solitude.lightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
                 }
             }, !{JSON.stringify(option)}))
 
             !{count ? ' && getCount()' : ''}
-            sco.owoBig({
+            Solitude.owoBig({
                 body: '.OwO-body',
                 item: '.OwO-items li'
             })
@@ -39,11 +39,11 @@ script().
 
         const loadTwikoo = () => {
             if (typeof twikoo === 'object') setTimeout(init,0)
-            else utils.getScript('!{url_for(theme.cdn.twikoo)}').then(init)
+            else Solitude.getScript('!{url_for(theme.cdn.twikoo)}').then(init)
         }
 
         if ('!{use[0]}' === 'Twikoo' || !{lazyload}) {
-            if (!{lazyload}) utils.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
+            if (!{lazyload}) Solitude.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
             else loadTwikoo()
         } else {
             window.loadTwoComment = loadTwikoo
@@ -74,7 +74,7 @@ if commentBarrage
                         id: item.id
                     })))
                 }
-                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                if (typeof initializeCommentBarrage === "undefined") await Solitude.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
                 else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/includes/widgets/third-party/comments/valine.pug

@@ -19,18 +19,18 @@ script.
                 visitor: #{visitor},
                 ...!{JSON.stringify(option)}
             })
-            GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll('#comment .vcontent img:not(.vemoji)'))
-            sco.owoBig({body: '.vwrap', item: '.vemojis i'})
+            Solitude.config.lightbox && Solitude.lightbox(document.querySelectorAll('#comment .vcontent img:not(.vemoji)'))
+            Solitude.owoBig({body: '.vwrap', item: '.vemojis i'})
         }
         const loadValine = async () => {
             if (typeof Valine === 'function') setTimeout(initValine, 0)
             else {
-                await utils.getScript('!{url_for(theme.cdn.valine)}').then(initValine)
+                await Solitude.getScript('!{url_for(theme.cdn.valine)}').then(initValine)
             }
             !{commentBarrage} && barrageValine()
         }
         if ('!{use[0]}' === 'Valine' || !{lazyload}) {
-            if (!{lazyload}) utils.loadComment(document.getElementById('vcomment'), loadValine)
+            if (!{lazyload}) Solitude.loadComment(document.getElementById('vcomment'), loadValine)
             else loadValine()
         } else {
             window.loadTwoComment = loadValine
@@ -65,8 +65,8 @@ if commentBarrage
                             mailMd5: md5(item.mail),
                             id: item.objectId
                         })))
-                if (typeof md5 === "undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
-                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                if (typeof md5 === "undefined") await Solitude.getScript('!{url_for(theme.cdn.blueimp_md5)}')
+                if (typeof initializeCommentBarrage === "undefined") await Solitude.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
                 else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/includes/widgets/third-party/comments/waline.pug

@@ -16,9 +16,9 @@ script.
                 ...!{JSON.stringify(option)}
             }
             const walineInstance = initFn(walineOptions)
-            utils.addGlobalFn('pjax', () => walineInstance.destroy(), 'destroyWaline')
-            GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll('#comment .wl-content img:not(.wl-emoji)'))
-            sco.owoBig({
+            Solitude.addGlobalFn('pjax', () => walineInstance.destroy(), 'destroyWaline')
+            Solitude.config.lightbox && Solitude.lightbox(document.querySelectorAll('#comment .wl-content img:not(.wl-emoji)'))
+            Solitude.owoBig({
                 body: '.wl-emoji-popup',
                 item: '.wl-tab-wrapper button'
             })
@@ -27,7 +27,7 @@ script.
         async function loadWaline() {
             if (walineInitFunction) initWaline(walineInitFunction)
             else {
-                await utils.getCSS('!{url_for(theme.cdn.waline_css)}')
+                await Solitude.getCSS('!{url_for(theme.cdn.waline_css)}')
                 const {init} = await import('!{url_for(theme.cdn.waline_js)}')
                 walineInitFunction = init || Waline.init
                 initWaline(walineInitFunction)
@@ -37,7 +37,7 @@ script.
         }
 
         if (!{use[0] === 'Waline'} || !{lazyload}) {
-            if (!{lazyload}) utils.loadComment(document.getElementById('waline-wrap'), loadWaline)
+            if (!{lazyload}) Solitude.loadComment(document.getElementById('waline-wrap'), loadWaline)
             else loadWaline()
         } else window.loadTwoComment = loadWaline
     })()
@@ -61,7 +61,7 @@ if commentBarrage
                             id: item.objectId
                         })))
                 }
-                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                if (typeof initializeCommentBarrage === "undefined") await Solitude.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
                 else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/includes/widgets/third-party/hot/index.pug

@@ -8,7 +8,7 @@ include ../../../mixins/common.pug
 - const { use } = theme.comment
 
 //- 主热门内容组件
-+conditionalWrapper(use && use.length > 0)
+if use && use.length > 0
   case use[0]
     when 'Twikoo'
       include ./twikoo

package/layout/includes/widgets/third-party/hot/twikoo.pug

@@ -52,6 +52,6 @@ script.
         if (typeof twikoo === 'object') {
             fetchCommentsCount();
         } else {
-            utils.getScript('!{url_for(theme.cdn.twikoo)}').then(fetchCommentsCount);
+            Solitude.getScript('!{url_for(theme.cdn.twikoo)}').then(fetchCommentsCount);
         }
     }

package/layout/includes/widgets/third-party/music.pug

@@ -1,8 +1,12 @@
-div.needEndHide#nav-music
+div.needEndHide#nav-music(data-solitude-action='handleMusicClick' data-solitude-event='true')
   #nav-music-hoverTips
-    i#music-prev.music-control-btn.fas.fa-backward-step(onclick='sco.musicSkipBack()')
-    i#music-pause.music-control-btn.fas.fa-pause(onclick='sco.musicToggle()')
-    i#music-play.music-control-btn.fas.fa-play(onclick='sco.musicToggle()')
-    i#music-next.music-control-btn.fas.fa-forward-step(onclick='sco.musicSkipForward()')
+    button#music-prev.music-control-btn(type='button' title=_p('right_menu.music.back') aria-label=_p('right_menu.music.back') data-solitude-action='musicSkipBack' data-solitude-stop='true')
+      i.fas.fa-backward-step
+    button#music-pause.music-control-btn(type='button' title=_p('right_menu.music.stop') aria-label=_p('right_menu.music.stop') data-solitude-action='musicToggle' data-solitude-stop='true')
+      i.fas.fa-pause
+    button#music-play.music-control-btn(type='button' title=_p('right_menu.music.start') aria-label=_p('right_menu.music.start') data-solitude-action='musicToggle' data-solitude-stop='true')
+      i.fas.fa-play
+    button#music-next.music-control-btn(type='button' title=_p('right_menu.music.forward') aria-label=_p('right_menu.music.forward') data-solitude-action='musicSkipForward' data-solitude-stop='true')
+      i.fas.fa-forward-step
 
   meting-js(id=theme.capsule.id server=theme.capsule.server type=theme.capsule.type mutex="true" preload="none" theme="var(--efu-main)" data-lrctype="0" order="random" volume=theme.capsule.volume)

package/layout/includes/widgets/third-party/news-comment/artalk.pug

@@ -34,14 +34,14 @@ script(pjax).
                         <img src='${item.avatar}' alt='${item.nick}'>
                     </div>
                     <div class='content'>
-                        <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
+                        <div class='comment' data-solitude-action='navigateTo' data-solitude-url='${item.url}'>${item.content}</div>
                         <time class="datetime" datetime="${item.date}"></time>
                     </div>
                 </div>
             `).join('') : "!{_p('newest_comment.zero')}";
             window.lazyLoadInstance?.update();
-            window.pjax?.refresh();
-            sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'));
+            Solitude.pjax?.refresh();
+            Solitude.changeTimeFormat?.(document.querySelectorAll('.aside-list-item time'));
         };
 
         const getSetting = async () => {
@@ -68,7 +68,7 @@ script(pjax).
                     url: e.page_key + `#atk-comment-${e.id}`,
                     date: e.date,
                 })).slice(0, !{limit});
-                utils.saveToLocal.set('artalk-newest-comments', artalk, !{theme.comment.newest_comment.storage});
+                Solitude.saveToLocal.set('artalk-newest-comments', artalk, !{theme.comment.newest_comment.storage});
                 generateHtml(artalk, asideList);
             }).catch(error => {
                 console.error(error);
@@ -78,7 +78,7 @@ script(pjax).
 
         const newestCommentInit = (asideList) => {
             if (!asideList) return;
-            const data = utils.saveToLocal.get('artalk-newest-comments');
+            const data = Solitude.saveToLocal.get('artalk-newest-comments');
             if (data) {
                 generateHtml(data, asideList);
             } else {
@@ -89,4 +89,4 @@ script(pjax).
         const $asideList = document.querySelector('.card-recent-comment .aside-list');
         window.addEventListener('DOMContentLoaded', () => newestCommentInit($asideList), false)
         window.addEventListener('pjax:complete', () => newestCommentInit(document.querySelector('.card-recent-comment .aside-list')), false);
-    })();
+    })();

package/layout/includes/widgets/third-party/news-comment/twikoo.pug

@@ -21,15 +21,15 @@ script.
                         <img src='${item.avatar}' alt='${item.nick}'>
                     </div>
                     <div class='content'>
-                        <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
+                        <div class='comment' data-solitude-action='navigateTo' data-solitude-url='${item.url}'>${item.content}</div>
                         <time class="datetime" datetime="${item.date}"></time>
                     </div>
                 </div>
             `).join('')
             document.querySelector('.card-recent-comment .aside-list').innerHTML = array.length ? html : "!{_p('newest_comment.zero')}"
             window.lazyLoadInstance?.update()
-            window.pjax?.refresh()
-            sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
+            Solitude.pjax?.refresh()
+            Solitude.changeTimeFormat?.(document.querySelectorAll('.aside-list-item time'))
         }
         const getComment = async () => {
             const runTwikoo = () => {
@@ -46,7 +46,7 @@ script.
                         url: `${e.url}#${e.id}`,
                         date: new Date(e.created).toString()
                     })).slice(0, 6)
-                    utils.saveToLocal.set('twikoo-newest-comment', twikooArray, !{theme.comment.newest_comment.storage})
+                    Solitude.saveToLocal.set('twikoo-newest-comment', twikooArray, !{theme.comment.newest_comment.storage})
                     generateHtml(twikooArray)
                 }).catch((err) => {
                     console.error(err);
@@ -56,14 +56,14 @@ script.
             if (typeof twikoo === 'object') {
                 runTwikoo()
             } else {
-                utils.getScript('!{url_for(theme.cdn.twikoo)}').then(runTwikoo)
+                Solitude.getScript('!{url_for(theme.cdn.twikoo)}').then(runTwikoo)
             }
         }
         const newestCommentInit = () => {
             if (!document.querySelector('.card-recent-comment')) return
-            const data = utils.saveToLocal.get('twikoo-newest-comment')
+            const data = Solitude.saveToLocal.get('twikoo-newest-comment')
             data ? generateHtml(data) : getComment()
         }
         window.addEventListener('DOMContentLoaded', newestCommentInit, false)
         window.addEventListener('pjax:complete', newestCommentInit, false);
-    })()
+    })()

package/layout/includes/widgets/third-party/news-comment/valine.pug

@@ -22,7 +22,7 @@ script.
         const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
             if (!document.querySelector('.card-recent-comment')) return
-            const data = utils.saveToLocal.get('valine-newest-comment')
+            const data = Solitude.saveToLocal.get('valine-newest-comment')
             if (data) {
                 generateHtml(data)
             } else {
@@ -39,7 +39,7 @@ script.
                     "Content-Type": "application/json"
                 },
             }
-            if (typeof md5 === "undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
+            if (typeof md5 === "undefined") await Solitude.getScript('!{url_for(theme.cdn.blueimp_md5)}')
             await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings).then(res => res.json())
                 .then(async result => {
                     let ls = []
@@ -53,7 +53,7 @@ script.
                             date: i.updatedAt || i.createdAt
                         })
                     }
-                    utils.saveToLocal.set('valine-newest-comment', ls, !{theme.comment.newest_comment.storage})
+                    Solitude.saveToLocal.set('valine-newest-comment', ls, !{theme.comment.newest_comment.storage})
                     generateHtml(ls)
                 }).catch(error => {
                     console.error(error);
@@ -65,21 +65,21 @@ script.
             const $dom = document.querySelector('.card-recent-comment .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                         <div class='aside-list-item'>
-                          <div onclick='pjax.loadUrl(\"${item.url}\")' class='thumbnail'>
+                          <div data-solitude-action='navigateTo' data-solitude-url='${item.url}' class='thumbnail'>
                             <img src='${item.avatar}' alt='${item.nick}'>
                             <div class='name'><span>${item.nick}</span></div>
                           </div>
                           <div class='content'>
-                            <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
+                            <div class='comment' data-solitude-action='navigateTo' data-solitude-url='${item.url}'>${item.content}</div>
                             <time class="datetime" datetime="${item.date}"></time>
                           </div>
                         </div>
                       `).join('') : "!{_p('newest_comment.zero')}"
             window.lazyLoadInstance?.update()
-            window.pjax?.refresh()
-            sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
+            Solitude.pjax?.refresh()
+            Solitude.changeTimeFormat?.(document.querySelectorAll('.aside-list-item time'))
         }
 
         window.addEventListener('DOMContentLoaded', newestCommentInit, false)
         window.addEventListener('pjax:complete', newestCommentInit, false);
-    })()
+    })()

package/layout/includes/widgets/third-party/news-comment/waline.pug

@@ -21,7 +21,7 @@ script.
         const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
             if (!document.querySelector('.card-recent-comment')) return
-            const data = utils.saveToLocal.get('waline-newest-comment')
+            const data = Solitude.saveToLocal.get('waline-newest-comment')
             if (data) {
                 generateHtml(data)
             } else {
@@ -41,7 +41,7 @@ script.
                         'date': new Date(e.time || e.insertedAt)
                     }
                 })
-                utils.saveToLocal.set('waline-newest-comment', walineArray, !{theme.comment.newest_comment.storage})
+                Solitude.saveToLocal.set('waline-newest-comment', walineArray, !{theme.comment.newest_comment.storage})
                 generateHtml(walineArray)
             }).catch(error => {
                 console.error(error)
@@ -53,21 +53,21 @@ script.
             const $dom = document.querySelector('.card-recent-comment .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
-                  <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
+                  <div data-solitude-action='navigateTo' data-solitude-url='${item.url}' class='thumbnail'>
                     <img src='${item.avatar}' alt='${item.nick}'>
                     <div class='name'><span>${item.nick}</span></div>
                   </div>
                   <div class='content'>
-                    <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
+                    <div class='comment' data-solitude-action='navigateTo' data-solitude-url='${item.url}'>${item.content}</div>
                     <time class="datetime" datetime="${item.date}"></time>
                   </div>
                 </div>
               `).join('') : "!{_p('newest_comment.zero')}"
             window.lazyLoadInstance?.update()
-            window.pjax?.refresh()
-            sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
+            Solitude.pjax?.refresh()
+            Solitude.changeTimeFormat?.(document.querySelectorAll('.aside-list-item time'))
         }
 
         window.addEventListener('DOMContentLoaded', newestCommentInit, false)
         window.addEventListener('pjax:complete', newestCommentInit, false);
-    })()
+    })()

package/layout/includes/widgets/third-party/pjax.pug

@@ -2,16 +2,13 @@
 - const select = ['title','#body-wrap','#site-config','meta[name="description"]','.js-pjax','meta[property^="og:"]','#config-diff', '.rs_show', '.rs_hide']
 
 script.
-    let pjax = null;
-
     function initPjax() {
         if (typeof Pjax === 'undefined') {
-            console.warn('Pjax is not loaded yet, retrying...');
             setTimeout(initPjax, 100);
             return;
         }
 
-        pjax = new Pjax({
+        const instance = new Pjax({
             elements: 'a:not([target="_blank"])',
             selectors: !{JSON.stringify(select)},
             cacheBust: false,
@@ -19,8 +16,7 @@ script.
             scrollRestoration: false
         })
 
-        // 将 pjax 实例挂载到全局
-        window.pjax = pjax;
+        Solitude.pjax = instance;
 
         document.querySelectorAll('script[data-pjax]').forEach(item => {
             const newScript = document.createElement('script')
@@ -30,8 +26,15 @@ script.
             item.parentNode.replaceChild(newScript, item)
         })
 
-        document.addEventListener('pjax:complete', () => {
-            window.refreshFn()
+        document.addEventListener('pjax:send', () => {
+            document.dispatchEvent(new CustomEvent('solitude:beforeNavigate'))
+            Solitude.disposePage?.()
+            Object.values(window.globalFn?.pjax || {}).forEach(dispose => dispose())
+            if (window.globalFn) window.globalFn.pjax = {}
+        })
+
+        document.addEventListener('pjax:complete', async () => {
+            await Solitude.refresh()
 
             document.querySelectorAll('script[data-pjax]').forEach(item => {
                 const newScript = document.createElement('script')
@@ -41,13 +44,16 @@ script.
                 item.parentNode.replaceChild(newScript, item)
             })
 
-            GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
+            Solitude.config.lazyload.enable && window.lazyLoadInstance?.update()
+            document.dispatchEvent(new CustomEvent('solitude:afterNavigate', {
+                detail: {page: Solitude.page}
+            }))
 
         })
 
         document.addEventListener('pjax:error', (e) => {
             if (e.request.status === 404) {
-                pjax.loadUrl('/404.html')
+                Solitude.navigate('/404.html')
             }
         })
     }

package/layout/includes/widgets/third-party/search/algolia-search.pug

@@ -12,9 +12,9 @@
         #search-results
             #algolia-hits
                 each tag in theme.search.tags || []
-                    a.tag-list(href='javascript:void(0);' onclick="pjax.loadUrl('" + url_for('/tags/' + tag) + "/')")=tag
+                    a.tag-list(href='javascript:void(0);' data-solitude-action="navigateTo" data-solitude-url=url_for('/tags/' + tag) + "/")=tag
 
         #algolia-tips
             #algolia-pagination
             #algolia-stats
-    #search-mask
+    #search-mask

package/layout/includes/widgets/third-party/search/docsearch.pug

@@ -10,7 +10,7 @@
         apiKey: '!{apiKey}',
         indexName: '!{indexName}',
         container: '#docsearch',
-        placeholder: '!{ placeholder || _p("search.input_placeholder")}',
+        placeholder: '!{ placeholder || _p("search.placeholder")}',
       }, !{JSON.stringify(option)}))
 
       const handleClick = () => {
@@ -18,9 +18,9 @@
       }
 
       const searchClickFn = () => {
-        utils.addEventListenerPjax(document.querySelector('#search-button > .search'), 'click', handleClick)
+        Solitude.addEventListenerPjax(document.querySelector('#search-button > .search'), 'click', handleClick)
       }
 
       searchClickFn()
       window.addEventListener('pjax:complete', searchClickFn)
-    })()
+    })()

package/layout/includes/widgets/third-party/search/index.pug

@@ -2,10 +2,8 @@ if theme.search.enable
     case theme.search.type
         when 'algolia'
             include algolia-search
-            script(src=url_for(theme.cdn.algolia_js))
         when 'local'
             include local-search
-            script(src=url_for(theme.cdn.local_search))
         when 'docsearch'
             include docsearch
-            link(rel="stylesheet" href=url_for(theme.cdn.docsearch_css))
+            link(rel="stylesheet" href=url_for(theme.cdn.docsearch_css))