hexo-theme-shokax 0.3.10 → 0.3.11

package/source/js/_app/pjax/siteInit.js

@@ -1,23 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const domInit_1 = __importDefault(require("./domInit"));
-const refresh_1 = require("./refresh");
-const scriptPjax_1 = require("../library/scriptPjax");
-const search_1 = require("../page/search");
-const globalVars_1 = require("../globals/globalVars");
-const themeColor_1 = require("../globals/themeColor");
-const handles_1 = require("../globals/handles");
-const tools_1 = require("../globals/tools");
-const fireworks_1 = require("../fireworks");
-const theme_shokax_pjax_1 = __importDefault(require("theme-shokax-pjax"));
-const vue_1 = require("../library/vue");
+import domInit from './domInit';
+import { pjaxReload, siteRefresh } from './refresh';
+import { cloudflareInit } from '../library/scriptPjax';
+import { algoliaSearch } from '../page/search';
+import { pjax, setPjax } from '../globals/globalVars';
+import { autoDarkmode, themeColorListener } from '../globals/themeColor';
+import { resizeHandle, scrollHandle, visibilityListener } from '../globals/handles';
+import { pagePosition } from '../globals/tools';
+import { initFireworks } from '../fireworks';
+import Pjax from 'theme-shokax-pjax';
+import { initVue } from '../library/vue';
 const siteInit = () => {
-    (0, domInit_1.default)();
-    (0, vue_1.initVue)();
-    (0, globalVars_1.setPjax)(new theme_shokax_pjax_1.default({
+    domInit();
+    initVue();
+    setPjax(new Pjax({
         selectors: [
             'head title',
             '.languages',
@@ -30,23 +25,24 @@ const siteInit = () => {
     }));
     CONFIG.quicklink.ignores = LOCAL.ignores;
     quicklink.listen(CONFIG.quicklink);
-    (0, themeColor_1.autoDarkmode)();
+    autoDarkmode();
     if (!CONFIG.disableVL) {
-        (0, handles_1.visibilityListener)();
+        visibilityListener();
     }
-    (0, themeColor_1.themeColorListener)();
-    (0, search_1.algoliaSearch)(globalVars_1.pjax);
-    (0, fireworks_1.initFireworks)();
-    window.addEventListener('scroll', handles_1.scrollHandle);
-    window.addEventListener('resize', handles_1.resizeHandle);
-    window.addEventListener('pjax:send', refresh_1.pjaxReload);
-    window.addEventListener('pjax:success', refresh_1.siteRefresh);
+    themeColorListener();
+    algoliaSearch(pjax);
+    initFireworks();
+    window.addEventListener('scroll', scrollHandle);
+    window.addEventListener('resize', resizeHandle);
+    window.addEventListener('pjax:send', pjaxReload);
+    window.addEventListener('pjax:success', siteRefresh); // 默认会传入一个event参数
     window.addEventListener('beforeunload', () => {
-        (0, tools_1.pagePosition)();
+        pagePosition();
     });
-    (0, refresh_1.siteRefresh)(1);
+    // clickMenu() TODO 暂时禁用
+    siteRefresh(1);
 };
-(0, scriptPjax_1.cloudflareInit)();
+cloudflareInit();
 window.addEventListener('DOMContentLoaded', siteInit, {
     passive: true
 });

package/source/js/_app/player.js

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mediaPlayer = void 0;
-const globalVars_1 = require("./globals/globalVars");
-const tools_1 = require("./globals/tools");
-const anime_1 = require("./library/anime");
-const dom_1 = require("./library/dom");
-const storage_1 = require("./library/storage");
-const tab_1 = require("./page/tab");
+import { originTitle } from './globals/globalVars';
+import { showtip } from './globals/tools';
+import { pageScroll } from './library/anime';
+import { $dom } from './library/dom';
+import { $storage } from './library/storage';
+import { tabFormat } from './page/tab';
 let NOWPLAYING = null;
 const isMobile = /mobile/i.test(window.navigator.userAgent);
-const mediaPlayer = (t, config) => {
+export const mediaPlayer = (t, config) => {
     if (CONFIG.noPlayer) {
         return;
     }
@@ -87,7 +84,7 @@ const mediaPlayer = (t, config) => {
                         t.player.options.mode = 'loop';
                 }
                 controller.btns.mode.className = 'mode ' + t.player.options.mode + ' btn';
-                storage_1.$storage.set('_PlayerMode', t.player.options.mode);
+                $storage.set('_PlayerMode', t.player.options.mode);
             },
             volume(e) {
                 e.preventDefault();
@@ -246,7 +243,7 @@ const mediaPlayer = (t, config) => {
                     return null;
                 }
                 const id = 'list-' + t.player._id + '-' + item.group;
-                let tab = (0, dom_1.$dom)('#' + id);
+                let tab = $dom('#' + id);
                 if (!tab) {
                     tab = el.createChild('div', {
                         id,
@@ -255,6 +252,7 @@ const mediaPlayer = (t, config) => {
                     });
                     if (t.player.group) {
                         tab.attr('data-title', t.player.options.rawList[item.group].title)
+                            // @ts-ignore
                             .attr('data-id', t.player._id);
                     }
                 }
@@ -278,7 +276,7 @@ const mediaPlayer = (t, config) => {
                 });
                 return item;
             });
-            (0, tab_1.tabFormat)();
+            tabFormat();
         },
         current() {
             return this.data[this.index];
@@ -293,7 +291,7 @@ const mediaPlayer = (t, config) => {
             li && li.addClass('active');
             tab = this.el.find('.tab')[item.group];
             tab && tab.addClass('active');
-            (0, anime_1.pageScroll)(item.el, item.el.offsetTop);
+            pageScroll(item.el, item.el.offsetTop);
             return this;
         },
         title() {
@@ -301,7 +299,7 @@ const mediaPlayer = (t, config) => {
                 return;
             }
             const current = this.current();
-            document.title = 'Now Playing...' + current.name + ' - ' + current.artist + ' | ' + globalVars_1.originTitle;
+            document.title = 'Now Playing...' + current.name + ' - ' + current.artist + ' | ' + originTitle;
         },
         error() {
             const current = this.current();
@@ -394,8 +392,9 @@ const mediaPlayer = (t, config) => {
                     const meta = utils.parse(raw);
                     if (meta[0]) {
                         const skey = JSON.stringify(meta);
-                        const playlist = storage_1.$storage.get(skey);
+                        const playlist = $storage.get(skey);
                         if (playlist) {
+                            // list.push.apply(list, JSON.parse(playlist))
                             list.push(...JSON.parse(playlist));
                             resolve(list);
                         }
@@ -404,10 +403,12 @@ const mediaPlayer = (t, config) => {
                                 .then((response) => {
                                 return response.json();
                             }).then((json) => {
-                                storage_1.$storage.set(skey, JSON.stringify(json));
+                                $storage.set(skey, JSON.stringify(json));
+                                // list.push.apply(list, json)
                                 list.push(...json);
                                 resolve(list);
                             }).catch((ex) => {
+                                // (不)处理catch的异常
                             });
                         }
                     }
@@ -437,16 +438,19 @@ const mediaPlayer = (t, config) => {
     t.player = {
         _id: utils.random(999999),
         group: true,
+        // 加载播放列表
         load(newList) {
             let d = '';
             if (newList && newList.length > 0) {
                 if (this.options.rawList !== newList) {
                     this.options.rawList = newList;
                     playlist.clear();
+                    // 获取新列表
                     this.fetch();
                 }
             }
             else {
+                // 没有列表时，隐藏按钮
                 d = 'none';
                 this.pause();
             }
@@ -495,6 +499,7 @@ const mediaPlayer = (t, config) => {
                 }
             });
         },
+        // 根据模式切换当前曲目index
         mode() {
             const total = playlist.data.length;
             if (!total || playlist.errnum === total) {
@@ -535,6 +540,7 @@ const mediaPlayer = (t, config) => {
             }
             this.init();
         },
+        // 直接设置当前曲目index
         switch(index) {
             if (typeof index === 'number' &&
                 index !== playlist.index &&
@@ -544,6 +550,7 @@ const mediaPlayer = (t, config) => {
                 this.init();
             }
         },
+        // 更新source为当前曲目index
         init() {
             const item = playlist.current();
             if (!item || item.error) {
@@ -557,8 +564,8 @@ const mediaPlayer = (t, config) => {
             }
             source.attr('src', item.url);
             source.attr('title', item.name + ' - ' + item.artist);
-            this.volume(storage_1.$storage.get('_PlayerVolume') || '0.7');
-            this.muted(storage_1.$storage.get('_PlayerMuted'));
+            this.volume($storage.get('_PlayerVolume') || '0.7');
+            this.muted($storage.get('_PlayerMuted'));
             progress.create();
             if (this.options.type === 'audio') {
                 preview.create();
@@ -576,16 +583,17 @@ const mediaPlayer = (t, config) => {
             source.play().then(() => {
                 playlist.scroll();
             }).catch((e) => {
+                // 不处理错误
             });
         },
         pause() {
             source.pause();
-            document.title = globalVars_1.originTitle;
+            document.title = originTitle;
         },
         stop() {
             source.pause();
             source.currentTime = 0;
-            document.title = globalVars_1.originTitle;
+            document.title = originTitle;
         },
         seek(time) {
             time = Math.max(time, 0);
@@ -596,11 +604,11 @@ const mediaPlayer = (t, config) => {
         muted(status) {
             if (status === 'muted') {
                 source.muted = status;
-                storage_1.$storage.set('_PlayerMuted', status);
+                $storage.set('_PlayerMuted', status);
                 controller.update(0);
             }
             else {
-                storage_1.$storage.del('_PlayerMuted');
+                $storage.del('_PlayerMuted');
                 source.muted = false;
                 controller.update(source.volume);
             }
@@ -608,7 +616,7 @@ const mediaPlayer = (t, config) => {
         volume(percentage) {
             if (!isNaN(percentage)) {
                 controller.update(percentage);
-                storage_1.$storage.set('_PlayerVolume', percentage);
+                $storage.set('_PlayerVolume', percentage);
                 source.volume = percentage;
             }
         },
@@ -622,6 +630,7 @@ const mediaPlayer = (t, config) => {
         index: 0,
         create(box) {
             const current = playlist.index;
+            // const that = this
             const raw = playlist.current().lrc;
             const callback = (body) => {
                 if (current !== playlist.index) {
@@ -655,6 +664,7 @@ const mediaPlayer = (t, config) => {
                         this.index = i;
                         const y = -(this.index - 1);
                         this.el.style.transform = 'translateY(' + y + 'rem)';
+                        // this.el.style.webkitTransform = 'translateY(' + y + 'rem)';
                         this.el.getElementsByClassName('current')[0].removeClass('current');
                         this.el.getElementsByTagName('p')[i].addClass('current');
                     }
@@ -670,12 +680,15 @@ const mediaPlayer = (t, config) => {
                 let lrc = [];
                 const lyricLen = lyric.length;
                 for (let i = 0; i < lyricLen; i++) {
+                    // match lrc time
                     const lrcTimes = lyric[i].match(/\[(\d{2}):(\d{2})(\.(\d{2,3}))?]/g);
+                    // match lrc text
                     const lrcText = lyric[i]
                         .replace(/.*\[(\d{2}):(\d{2})(\.(\d{2,3}))?]/g, '')
                         .replace(/<(\d{2}):(\d{2})(\.(\d{2,3}))?>/g, '')
                         .trim();
                     if (lrcTimes) {
+                        // handle multiple time tag
                         const timeLen = lrcTimes.length;
                         for (let j = 0; j < timeLen; j++) {
                             const oneTime = /\[(\d{2}):(\d{2})(\.(\d{2,3}))?]/.exec(lrcTimes[j]);
@@ -687,6 +700,7 @@ const mediaPlayer = (t, config) => {
                         }
                     }
                 }
+                // sort by time
                 lrc = lrc.filter((item) => item[1]);
                 lrc.sort((a, b) => a[0] - b[0]);
                 return lrc;
@@ -702,6 +716,7 @@ const mediaPlayer = (t, config) => {
             }).then((body) => {
                 callback(body);
             }).catch((ex) => {
+                // 不处理错误
             });
         }
     };
@@ -721,7 +736,7 @@ const mediaPlayer = (t, config) => {
         },
         onplay() {
             t.parentNode.addClass('playing');
-            (0, tools_1.showtip)(this.attr('title'));
+            showtip(this.attr('title'));
             NOWPLAYING = t;
         },
         onpause() {
@@ -744,9 +759,12 @@ const mediaPlayer = (t, config) => {
             return;
         }
         t.player.options = Object.assign(option, config);
-        t.player.options.mode = storage_1.$storage.get('_PlayerMode') || t.player.options.mode;
+        t.player.options.mode = $storage.get('_PlayerMode') || t.player.options.mode;
+        // 初始化button、controls以及click事件
         buttons.create();
+        // 初始化audio or video
         source = t.createChild(t.player.options.type, events);
+        // 初始化播放列表、预览、控件按钮等
         info.create();
         t.parentNode.addClass(t.player.options.type);
         t.player.created = true;
@@ -754,4 +772,3 @@ const mediaPlayer = (t, config) => {
     init(config);
     return t;
 };
-exports.mediaPlayer = mediaPlayer;

package/test/dom.test.js

@@ -1,86 +0,0 @@
-const { describe, beforeEach, afterEach, it } = require('mocha')
-const jsdom = require('jsdom')
-const { $dom } = require('../source/js/_app/library/dom')
-const { expect } = require('chai')
-
-describe('$dom', function () {
-  // 在每个测试用例之前创建一个虚拟文档
-  beforeEach(function () {
-    const html = `
-      <html lang="zh-cn">
-        <head><title>Test Page</title></head>
-        <body>
-          <div id="container">
-            <p class="text">Hello</p>
-            <p class="text">World</p>
-          </div>
-        </body>
-      </html>
-    `
-    const dom = new jsdom.JSDOM(html)
-    global.document = dom.window.document
-    global.HTMLElement = dom.window.HTMLElement
-  })
-
-  // 在每个测试用例之后清除虚拟文档
-  afterEach(function () {
-    global.document = null
-  })
-
-  it('should return the element with the given id selector', function () {
-    const element = $dom('#container')
-    expect(element).to.exist
-    expect(element).to.be.instanceOf(HTMLElement)
-    expect(element.id).to.equal('container')
-  })
-
-  it('should return the first element that matches the given selector', function () {
-    const element = $dom('.text')
-    expect(element).to.exist
-    expect(element).to.be.instanceOf(HTMLElement)
-    expect(element.textContent).to.equal('Hello')
-  })
-
-  it('should return null if no element matches the given selector', function () {
-    const element = $dom('.foo')
-    expect(element).to.be.null
-  })
-})
-
-describe('$dom.all & $dom.each', function () {
-  beforeEach(function () {
-    const html = `
-      <html lang="zh-cn">
-        <head><title>Test Page</title></head>
-        <body>
-          <div id="container">
-            <p class="text">Hello</p>
-            <p class="text">World</p>
-          </div>
-        </body>
-      </html>
-    `
-    const dom = new jsdom.JSDOM(html)
-    global.document = dom.window.document
-    global.HTMLElement = dom.window.HTMLElement
-  })
-
-  afterEach(function () {
-    global.document = null
-  })
-
-  it('should return all elements with the given selector', () => {
-    const elements = $dom.all('p')
-    expect(elements).to.be.exist
-    expect(elements).length(2)
-  })
-
-  it('should run callback with the given selector', () => {
-    $dom.each('p', function (value){
-      value.innerText = 'test'
-    })
-    const elements = $dom.all('p')
-    expect(elements[0].innerText).equal('test')
-    expect(elements[1].innerText).equal('test')
-  })
-})