hexo-theme-solitude 3.0.21 → 4.0.0

package/layout/includes/head/config.pug

@@ -1,28 +1,28 @@
 -
     if (theme.search.enable) {
-        var localSearch = 'undefined';
-        var algolia = 'undefined';
+        var localSearch = null;
+        var algolia = null;
         switch (theme.search.type) {
             case 'local':
-                localSearch = JSON.stringify({
+                localSearch = {
                     preload: theme.search.local.preload,
                     path: theme?.search?.local?.CDN || '/search.xml'
-                });
+                };
                 break;
             case 'algolia':
-                algolia = JSON.stringify({
+                algolia = {
                     appId: config.algolia.appId || config.algolia.applicationID,
                     apiKey: config.algolia.apiKey,
                     indexName: config.algolia.indexName,
                     hits: {
                         per_page: theme?.search?.algolia?.hits?.per_page || 10
                     }
-                });
+                };
                 break;
         }
     }
 
-    const witty_words = theme.aside?.my_card?.witty_words?.map(item => `"${item}"`) || [];
+    const witty_words = theme.aside?.my_card?.witty_words || [];
     const [hello_prefix, hello_back] = [_p('aside.hello'), _p('aside.back')];
 
     let comment = false
@@ -36,13 +36,13 @@
 
     let copyright = false;
     if (theme.copy.enable && theme.copy.copyright.enable) {
-        copyright = JSON.stringify({
+        copyright = {
             limit: theme.copy.copyright.limit,
             author: _p("copy_copyright.author") + ': ' + config.author,
             link: _p("copy_copyright.link") + ': ',
             source: _p("copy_copyright.source") + ': ' + config.title,
             info: _p("copy_copyright.info")
-        })
+        }
     }
 
     let lang = false
@@ -116,7 +116,11 @@
     if (theme.translate.enable) {
         translate = {
             translateDelay: theme.translate.translateDelay,
-            defaultEncoding: theme.translate.defaultEncoding
+            defaultEncoding: theme.translate.defaultEncoding,
+            toSimplified: _p('right_menu.cht_to_chs'),
+            toTraditional: _p('right_menu.chs_to_cht'),
+            switchedToSimplified: _p('right_menu.converted_to_chs'),
+            switchedToTraditional: _p('right_menu.converted_to_cht')
         }
     }
 
@@ -148,41 +152,81 @@
         }
     }
 
-script.
-    const GLOBAL_CONFIG = {
-        root: '!{config.root}',
-        algolia: !{algolia ? algolia : 'undefined'},
-        localsearch: !{localSearch ? localSearch : 'undefined'},
-        runtime: '!{theme.aside.siteinfo.runtimeenable ? theme.aside.siteinfo.runtime : false}',
+    const friendLinksGroups = site.data.links && Array.isArray(site.data.links.links) ? site.data.links.links : []
+    const friendLinksTotal = friendLinksGroups.reduce((count, group) => count + (Array.isArray(group.link_list) ? group.link_list.length : 0), 0)
+    const configuredFriendLinksThreshold = Number(theme.page && theme.page.links && theme.page.links.async_threshold)
+    const friendLinksThreshold = Number.isInteger(configuredFriendLinksThreshold) && configuredFriendLinksThreshold >= 0 ? configuredFriendLinksThreshold : 200
+    const friendLinks = {
+        async: friendLinksTotal > friendLinksThreshold,
+        path: url_for('/links.json'),
+        total: friendLinksTotal,
+        placeholder: theme.lazyload.placeholder ? url_for(theme.lazyload.placeholder) : '',
+        default_avatar: url_for('/img/default_avatar.avif'),
+        more_url: url_for('/links/'),
+        loading: _p('link.loading'),
+        error: _p('link.error'),
+        retry: _p('link.retry'),
+        random: _p('link.random'),
+        to: _p('link.to'),
+        more: _p('more'),
+        default_sort: _p('link.default_sort'),
+        random_sort: _p('link.random_sort'),
+        sort_label: _p('link.sort_label'),
+        scroll_left: _p('link.scroll_left'),
+        scroll_right: _p('link.scroll_right')
+    }
+
+-
+    const globalConfig = {
+        root: config.root,
+        algolia,
+        localsearch: localSearch,
+        runtime: theme.aside.siteinfo.runtimeenable ? theme.aside.siteinfo.runtime : false,
         lazyload: {
-            enable: !{theme.lazyload.enable},
-            error: '!{theme.lazyload.errorimg}'
+            enable: theme.lazyload.enable,
+            error: theme.lazyload.errorimg
         },
-        copyright: !{copyright},
-        highlight: !{highlight ? JSON.stringify(highlight) : false},
-        randomlink: !{theme.footer.randomlink},
-        lang: !{JSON.stringify(lang)},
+        copyright,
+        highlight,
+        friend_links: friendLinks,
+        random_posts: site.posts.filter(post => post.random !== false).map(post => post.path),
+        randomlink: theme.footer.randomlink,
+        feature_modules: {
+            search: theme.search.enable ? theme.search.type : false,
+            post_ai: theme.post.ai.enable,
+            friend_links: friendLinks.total > 0,
+            music: theme.capsule.enable || theme.music.enable || (theme.brevity.enable && theme.brevity.music),
+            right_menu: theme.right_menu.enable,
+            translate: theme.translate.enable,
+            covercolor: theme.post.covercolor.enable ? theme.post.covercolor.mode : false
+        },
+        lang,
         aside: {
             state: {
-                morning: "!{theme.aside.my_card.state.morning}",
-                noon: "!{theme.aside.my_card.state.noon}",
-                afternoon: "!{theme.aside.my_card.state.afternoon}",
-                night: "!{theme.aside.my_card.state.night}",
-                goodnight: "!{theme.aside.my_card.state.goodnight}",
+                morning: theme.aside.my_card.state.morning,
+                noon: theme.aside.my_card.state.noon,
+                afternoon: theme.aside.my_card.state.afternoon,
+                night: theme.aside.my_card.state.night,
+                goodnight: theme.aside.my_card.state.goodnight
             },
-            witty_words: [!{witty_words}],
+            witty_words,
             witty_comment: {
-                prefix: '!{hello_prefix}',
-                back: '!{hello_back}',
-            },
+                prefix: hello_prefix,
+                back: hello_back
+            }
         },
         covercolor: {
-            enable: !{theme.post.covercolor.enable}
+            enable: theme.post.covercolor.enable,
+            mode: theme.post.covercolor.mode,
+            api: theme.post.covercolor.api,
+            time: theme.post.covercolor.time
         },
-        comment: !{comment ? JSON.stringify(comment) : false},
-        lightbox: '!{ theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null")}',
-        right_menu: !{rightMenu ? JSON.stringify(rightMenu) : false},
-        translate: !{translate ? JSON.stringify(translate) : false},
-        lure: !{lure ? JSON.stringify(lure) : false},
-        expire: !{expire ? JSON.stringify(expire) : false},
-    };
+        comment,
+        lightbox: theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : null),
+        right_menu: rightMenu,
+        translate,
+        lure,
+        expire
+    };
+
+template#site-config!= JSON.stringify(globalConfig).replace(/</g, '\\u003c')

package/layout/includes/head/mode.pug

@@ -3,7 +3,7 @@ case theme.display_mode.type
         script.
             initTheme = () => {
                 let isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-                const cachedMode = utils.saveToLocal.get('theme');
+                const cachedMode = Solitude.saveToLocal.get('theme');
                 if (cachedMode === undefined) {
                     const nowMode =
                         isDarkMode ? 'dark' : 'light'
@@ -11,28 +11,28 @@ case theme.display_mode.type
                 } else {
                     document.documentElement.setAttribute('data-theme', cachedMode);
                 }
-                typeof rm === 'object' && rm.mode(cachedMode === 'dark' && isDarkMode)
+                Solitude.rightMenu?.mode(cachedMode === 'dark' && isDarkMode)
             }
             initTheme()
     when "dark"
         script.
             initTheme = () => {
-                const cachedMode = utils.saveToLocal.get('theme');
+                const cachedMode = Solitude.saveToLocal.get('theme');
                 if (cachedMode === undefined)
                     document.documentElement.setAttribute('data-theme', 'dark');
                 else
                     document.documentElement.setAttribute('data-theme', cachedMode);
-                typeof rm === 'object' && rm.mode(cachedMode === undefined || cachedMode === 'dark')
+                Solitude.rightMenu?.mode(cachedMode === undefined || cachedMode === 'dark')
             }
             initTheme()
     when "light"
         script.
             initTheme = () => {
-                const cachedMode = utils.saveToLocal.get('theme');
+                const cachedMode = Solitude.saveToLocal.get('theme');
                 if (cachedMode === undefined)
                     document.documentElement.setAttribute('data-theme', 'light');
                 else
                     document.documentElement.setAttribute('data-theme', cachedMode);
-                typeof rm === 'object' && rm.mode(cachedMode === 'dark')
+                Solitude.rightMenu?.mode(cachedMode === 'dark')
             }
-            initTheme()
+            initTheme()

package/layout/includes/head/page_config.pug

@@ -1,13 +1,22 @@
 - var showToc = !!page.toc && (toc(page.content) !== '' || page.encrypt === true);
 
-script#config-diff.
-    var PAGE_CONFIG = {
-        is_post: !{is_post()},
-        is_page: !{!is_post() && !is_home()},
-        is_home: !{is_home()},
-        page: '!{page.type}',
-        toc: !{showToc},
-        comment: !{!!page.comment},
-        ai_text: !{is_post && theme.post.ai.enable && page.ai_text ? "'"+ page.ai_text+"'" : false},
-        color: !{page.color ? "'"+ page.color+"'" : false},
-    }
+-
+  const pageConfig = {
+    is_post: is_post(),
+    is_page: !is_post() && !is_home(),
+    is_home: is_home(),
+    page: is_post()
+      ? 'post'
+      : (is_home()
+        ? 'solitude'
+        : (is_archive()
+          ? 'archive'
+          : (is_category()
+            ? 'category'
+            : (is_tag() ? 'tag' : (page.type || page.layout || 'page'))))),
+    toc: showToc,
+    comment: !!page.comment,
+    ai_text: is_post() && theme.post.ai.enable && page.ai_text ? page.ai_text : false,
+    color: page.color || false
+  }
+template#config-diff!= JSON.stringify(pageConfig).replace(/</g, '\\u003c')

package/layout/includes/inject/body.pug

@@ -1,4 +1,9 @@
 - page.type = is_post() ? 'post' : page.type
+- const bodyFriendLinksGroups = site.data.links && Array.isArray(site.data.links.links) ? site.data.links.links : []
+- const bodyFriendLinksTotal = bodyFriendLinksGroups.reduce((count, group) => count + (Array.isArray(group.link_list) ? group.link_list.length : 0), 0)
+- const configuredBodyFriendLinksThreshold = Number(theme.page && theme.page.links && theme.page.links.async_threshold)
+- const bodyFriendLinksThreshold = Number.isInteger(configuredBodyFriendLinksThreshold) && configuredBodyFriendLinksThreshold >= 0 ? configuredBodyFriendLinksThreshold : 200
+- const bodyFriendLinksAsync = bodyFriendLinksTotal > bodyFriendLinksThreshold
 
 mixin katex
   if theme.katex.copytex
@@ -6,17 +11,16 @@ mixin katex
       script.
         (() => {
           document.querySelectorAll('.article-container span.katex-display').forEach(item => {
-            utils.wrap(item, 'div', {class: 'katex-wrap'})
+            Solitude.wrap(item, 'div', {class: 'katex-wrap'})
           })
         })();
 
 div
   // Critical scripts loaded synchronously
   script(src=url_for(theme.cdn.utils))
-  script(src=url_for(theme.cdn.main))
   
   // Non-critical scripts loaded asynchronously
-  script(async src=url_for(theme.cdn.waterfall))
+  script(defer src=url_for(theme.cdn.waterfall))
   script(src=url_for(theme.cdn.pjax))
 
   // Feature-specific scripts loaded asynchronously
@@ -39,9 +43,6 @@ div
         if (typeof dark === 'function') dark();
       });
 
-  if theme.translate.enable
-    script(defer src=url_for(theme.cdn.translate_js))
-
   if theme.katex && theme.katex.enable
     if theme.katex.per_page && (is_post() || is_page())
       +katex
@@ -60,9 +61,6 @@ div
   if (theme.brevity.home_mini && theme.brevity.enable)
     script(src=url_for(theme.cdn.swiper_js))
 
-  if theme.post.ai.enable
-    script(defer src=url_for(theme.cdn.post_ai))
-
   // Music player scripts
   if theme.capsule.enable || theme.music.enable || theme.brevity.enable && theme.brevity.music
     script.
@@ -71,24 +69,8 @@ div
     script(defer src=url_for(theme.cdn.meting_js))
 
   // Cover color processing scripts
-  if theme.post.covercolor.enable
-    case theme.post.covercolor.mode
-      when 'local'
-        script(defer src=url_for(theme.cdn.color_thief))
-        script(defer src=url_for(theme.cdn.cover_local))
-      when 'api'
-        script.
-          const coverColorConfig = {
-            api: '!{theme.post.covercolor.api}',
-            time: !{theme.post.covercolor.time}
-          }
-        script(defer src=url_for(theme.cdn.cover_api))
-      when 'ave'
-        script.
-          const coverColorConfig = {
-            time: !{theme.post.covercolor.time}
-          }
-        script(defer src=url_for(theme.cdn.cover_ave))
+  if theme.post.covercolor.enable && theme.post.covercolor.mode === 'local'
+    script(defer src=url_for(theme.cdn.color_thief))
 
   if theme.loading.pace
     include ../mixins/pace.pug
@@ -96,11 +78,9 @@ div
   // Search functionality
   if theme.search.enable && theme.search.type === "algolia"
     script(defer src=url_for(theme.cdn.instantsearch))
-    script(defer src=url_for(theme.cdn.algolia_search))
 
-  // Right menu functionality
-  if theme.right_menu.enable
-    script(defer src=url_for(theme.cdn.right_menu_js))
+  // Main module dynamically imports enabled first-party features.
+  script(type="module" src=url_for(theme.cdn.main))
 
   if theme.extends.body
     each item in theme.extends.body
@@ -109,11 +89,11 @@ div
   .js-pjax
     if is_home() && theme.brevity.enable && theme.brevity.home_mini
       script.
-        sco.initbbtalk()
+        Solitude.initbbtalk()
     if page.type === 'brevity' && theme.brevity.enable
       script.
-        GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
-        sco.changeTimeFormat(document.querySelectorAll('.bber-info-time time'))
+        Solitude.config.lightbox && Solitude.lightbox(document.querySelectorAll(".bber-content-img img"));
+        Solitude.changeTimeFormat(document.querySelectorAll('.bber-info-time time'))
     if page.comment
       include ../widgets/third-party/comments/js
     if theme.mermaid
@@ -124,8 +104,6 @@ div
       script(defer pjax src=url_for(theme.cdn.busuanzi_js))
 
 
-if theme.footer.randomlink
-  include ../widgets/randomlink.pug
 
 // pjax
 != partial("includes/widgets/third-party/pjax", {}, {cache: true})

package/layout/includes/keyboard.pug

@@ -30,12 +30,12 @@ script.
                     }
                 } else {
                     if (e.key === keyboards[i].key) {
-                        pjax.loadUrl(keyboards[i].url);
+                        Solitude.navigate(keyboards[i].url);
                     }
                 }
             } else if (keyboards[i].sco) {
                 if (e.key === keyboards[i].key) {
-                    sco[keyboards[i].sco]();
+                    Solitude[keyboards[i].sco]?.();
                 }
             } else if (keyboards[i].func) {
                 if (e.key === keyboards[i].key) {
@@ -63,4 +63,4 @@ script.
         openKeyboard();
         let keyboard = document.getElementById('consoleKeyboard');
         keyboard?.classList.add('on');
-    }
+    }

package/layout/includes/loading.pug

@@ -1,39 +1,3 @@
-div(id="loading-box" onclick="preloader.endLoading();" style="zoom:1")
+div(id="loading-box" data-solitude-action="endLoading" style="zoom:1")
     div.loading-bg
         img.loading-img.nolazyload(src=url_for(theme.loading.favicon || theme.site.icon), alt="loading image")
-
-script.
-    const preloader = {
-        isLoaded: false,
-        endLoading: () => {
-            if (!preloader.isLoaded) {
-                document.getElementById('loading-box').classList.add('loaded');
-                preloader.isLoaded = true;
-                preloader.togglePaceDone();
-            }
-        },
-        initLoading: () => {
-            document.getElementById('loading-box').classList.remove('loaded');
-            preloader.isLoaded = false;
-            preloader.togglePaceDone();
-        },
-        togglePaceDone: () => {
-            document.getElementById('body').className = preloader.isLoaded ? 'pace-done' : '';
-        }
-    }
-
-    window.addEventListener('load', () => {
-        preloader.endLoading();
-    });
-
-    window.addEventListener('pjax:send', () => {
-        preloader.initLoading();
-    });
-
-    document.addEventListener('pjax:complete', () => {
-        preloader.endLoading();
-    });
-
-    setTimeout(() => {
-        preloader.endLoading();
-    }, 5000);

package/layout/includes/mixins/articleSort.pug

@@ -7,10 +7,10 @@ each post in page.posts.find({ parent: { $exists: false } }).data
         a.article-sort-item-img(href=url_for(post.path) title=post.title)
             img(src=url_for(post.cover) alt=post.title)
         .article-sort-item-info
-            a.article-sort-item-title(href=url_for(post.path) title=post.title onclick="window.event.cancelBubble=true;") #{post.title}
+            a.article-sort-item-title(href=url_for(post.path) title=post.title data-solitude-action="noop" data-solitude-stop="true") #{post.title}
             .article-sort-item-tags
                 each tags in post.tags.data
-                    a.article-meta__tags(href=url_for(tags.path) onclick="window.event.cancelBubble=true;")
+                    a.article-meta__tags(href=url_for(tags.path) data-solitude-action="noop" data-solitude-stop="true")
                         span.tags-punctuation
                             i.solitude.fas.fa-hashtag
-                            =tags.name
+                            =tags.name

package/layout/includes/mixins/common.pug

@@ -16,14 +16,18 @@ mixin link(url, text, options)
   - var target = options.target
   - var className = options.class
   - var id = options.id
-  - var onclick = options.onclick
+  - var action = options.action
+  - var stop = options.stop
+  - var heotip = options.heotip
   a(
     href=url_for(url)
     title=title
     target=target
     class=className
     id=id
-    onclick=onclick
+    data-solitude-action=action
+    data-solitude-stop=stop
+    heotip=heotip
   )
     if text
       = text
@@ -93,7 +97,7 @@ mixin postMeta(post, options)
     if showTags && post.tags && post.tags.length > 0
       span.article-meta.tags
         each tag in post.tags.data
-          - var linkOptions = { class: 'article-meta__tags', onclick: 'event.stopPropagation();' }
+          - var linkOptions = { class: 'article-meta__tags', action: 'noop', stop: 'true' }
           +link(tag.path, '', linkOptions)
             span.tags-punctuation
               +icon('fas fa-hashtag')
@@ -176,4 +180,4 @@ mixin shareButton(platform, url, title)
   
   - var linkOptions = { class: 'share-' + platform, target: '_blank', title: '分享到' + platform }
   +link(shareUrl, '', linkOptions)
-    +icon('fab fa-' + platform)
+    +icon('fab fa-' + platform)

package/layout/includes/mixins/pace.pug

@@ -3,7 +3,7 @@ script.
     restartOnPushState: false
   }
 
-  utils.addGlobalFn('pjaxSend', () => {
+  Solitude.addGlobalFn('pjaxSend', () => {
     Pace.restart()
   }, 'pace_restart')
 

package/layout/includes/mixins/pagination.pug

@@ -3,6 +3,6 @@ nav#pagination
         - var options = {mid_size: 1,escape: false,next_text: `<div class="pagination_tips_next">${_p("pagination.next")}</div> <i class="solitude fas fa-chevron-right"></i>`,prev_text: `<i class="solitude fas fa-chevron-left"></i> <div class="pagination_tips_prev">${_p("pagination.prev")}</div>`}
         !=paginator(options)
         div.toPageGroup
-            input#toPageText(oninput="value=value.replace(/[^0-9]/g,'')" maxlength="3" title=_p('pagination.to') onkeyup="if (this.value === '0') this.value = ''")
-            a#toPageButton(onclick="sco.toPage()")
-                i.solitude.fas.fa-angles-right
+            input#toPageText(inputmode="numeric" pattern="[0-9]*" maxlength="3" title=_p('pagination.to'))
+            a#toPageButton(data-solitude-action="toPage")
+                i.solitude.fas.fa-angles-right

package/layout/includes/nav.pug

@@ -8,7 +8,8 @@ include ./mixins/common.pug
 mixin siteName()
   +link('/', '', { 
     id: 'site-name', 
-    title: _p('nav.site_name_title') 
+    title: _p('nav.site_name_title'),
+    heotip: _p('nav.site_name_title')
   })
     case theme.site.name.class
       when 'i_class'
@@ -19,7 +20,7 @@ mixin siteName()
         span.title= theme.site.name.custom
     +icon('fas fa-home')
 
-nav#nav.show
+nav#nav.show(data-solitude-action="onNavBlankClickCloseConsole" data-solitude-event="true")
     #nav-group
         #blog_name
             //- 分组导航按钮
@@ -34,7 +35,7 @@ nav#nav.show
         //- 页面名称遮罩
         #page-name-mask
             #page-name
-                a#page-name-text(onclick="sco.toTop()")= title || config.title
+                a#page-name-text(data-solitude-action="toTop" title=_p('nav.backtop') heotip=_p('nav.backtop'))= title || config.title
         
         //- 主菜单
         #menus

package/layout/includes/page/about.pug

@@ -1,11 +1,12 @@
 if site.data.about
     #about-page
         include ../widgets/page/about/authorinfo
-        include ../widgets/page/about/contentinfo
-        include ../widgets/page/about/skillsinfo
-        include ../widgets/page/about/personalities
-        include ../widgets/page/about/motto
-        include ../widgets/page/about/hobbies
-        include ../widgets/page/about/other
-        include ../widgets/page/about/tenyear
-        include ../widgets/page/about/award
+        .author-page-content
+            include ../widgets/page/about/contentinfo
+            include ../widgets/page/about/skillsinfo
+            include ../widgets/page/about/personalities
+            include ../widgets/page/about/motto
+            include ../widgets/page/about/hobbies
+            include ../widgets/page/about/other
+            include ../widgets/page/about/tenyear
+            include ../widgets/page/about/award

package/layout/includes/page/brevity.pug

@@ -12,7 +12,7 @@ if theme.brevity.enable
                                     span.bber_nick= config.author
                                     time.datetime.bber_date(datetime=moment(item.date).format())
                                 if theme.comment.use && item.content
-                                    a.bber-reply.goComment(onclick=`sco.toTalk('${item.content}')`)
+                                    a.bber-reply.goComment(data-solitude-action="toTalk" data-solitude-value=item.content)
                                         i.solitude.fas.fa-comment
 
                         #bber-content
@@ -52,7 +52,7 @@ if theme.brevity.enable
                                             i.solitude.fas.fa-link
                                             = _p('essay.link')
                                 if theme.comment.use && item.content
-                                    a.bber-reply(onclick=`sco.toTalk('${item.content}')`)
+                                    a.bber-reply(data-solitude-action="toTalk" data-solitude-value=item.content)
                                         i.solitude.fas.fa-comment
             #bber-tips
                 if theme.brevity.strip === -1

package/layout/includes/page/links.pug

@@ -1,16 +1,28 @@
 - var $data = page.data
+- const linksPageData = site.data[$data]
+- const linksGroups = linksPageData && Array.isArray(linksPageData.links) ? linksPageData.links : []
+- const linksTotal = linksGroups.reduce((count, group) => count + (Array.isArray(group.link_list) ? group.link_list.length : 0), 0)
+- const configuredLinksThreshold = Number(theme.page && theme.page.links && theme.page.links.async_threshold)
+- const linksThreshold = Number.isInteger(configuredLinksThreshold) && configuredLinksThreshold >= 0 ? configuredLinksThreshold : 200
+- const asyncLinks = linksTotal > linksThreshold
 if page.banner
     .flink#banners
         include ../widgets/page/links/banner
 .flink.article-container
-    each data in site.data[$data].links
-        h2= data.class_name + " (" + data.link_list.length + ")"
-        .flink-desc= data.descr
-        case data.type
-            when 'card'
-                include ../widgets/page/links/linksCard
-            when 'item'
-                include ../widgets/page/links/linksItem
-            when 'discn'
-                include ../widgets/page/links/linksDiscn
-    != page.content
+    if asyncLinks
+        .friend-links-dynamic(data-friend-links-list)
+            .flink-loading-skeleton(role="status" aria-label=_p('link.loading'))
+                each item in [0, 1, 2, 3, 4, 5]
+                    .flink-loading-item
+    else
+        each data in linksGroups
+            h2= data.class_name + " (" + data.link_list.length + ")"
+            .flink-desc= data.descr
+            case data.type
+                when 'card'
+                    include ../widgets/page/links/linksCard
+                when 'item'
+                    include ../widgets/page/links/linksItem
+                when 'discn'
+                    include ../widgets/page/links/linksDiscn
+    != page.content

package/layout/includes/page/music.pug

@@ -4,8 +4,3 @@ if theme.music.enable
         meting-js(id=theme.music.id server=theme.music.server type=theme.music.type mutex=theme.music.mutex ? "true" : "false" volume=theme.music.volume preload="none" data-lrctype="0" order=theme.music.order)
     .Music-loading
         div APlayer加载中...
-    script(pjax).
-        (async function () {
-            if (typeof initializeMusicPlayer === "undefined") await utils.getScript('!{url_for(theme.cdn.music_js)}').then(() => initializeMusicPlayer())
-            else initializeMusicPlayer()
-        })()