hexo-theme-solitude 2.0.9 → 2.0.11

package/source/js/covercolor/local.js

@@ -12,93 +12,21 @@ function setDefaultThemeColors() {
 }
 
 const localColor = path => {
+    var colorThief = new ColorThief();
     const img = new Image();
     img.crossOrigin = "Anonymous";
-    img.onload = () => setThemeColors(calculateColor(img));
+    img.onload = () => setThemeColors(rgbToHex(colorThief.getColor(img)));
     img.onerror = () => console.error('Image Error');
     img.src = path;
 }
 
-const calculateColor = img => {
-    const canvas = document.createElement("canvas");
-    const ctx = canvas.getContext("2d");
-    ctx.drawImage(img, 0, 0);
-    const data = ctx.getImageData(0, 0, img.width, img.height).data;
-    const {r, g, b} = calculateRGB(data);
-    let value = rgbToHex(r, g, b);
-    return getContrastYIQ(value) === "light" ? LightenDarkenColor(value, -50) : LightenDarkenColor(value, 20);
-}
-
-function calculateRGB(data) {
-    let r = 0, g = 0, b = 0;
-    const step = 5;
-    for (let i = 0; i < data.length; i += 4 * step) {
-        r += data[i];
-        g += data[i + 1];
-        b += data[i + 2];
-    }
-    r = Math.floor(r / (data.length / 4 / step));
-    g = Math.floor(g / (data.length / 4 / step));
-    b = Math.floor(b / (data.length / 4 / step));
-    return {r, g, b};
-}
-
-function rgbToHex(r, g, b) {
-    return "#" + [r, g, b].map(x => x.toString(16).padStart(2, '0')).join('');
-}
-
-function LightenDarkenColor(col, amt) {
-    let usePound = false;
-
-    if (col[0] === "#") {
-        col = col.slice(1);
-        usePound = true;
-    }
-
-    const num = parseInt(col, 16);
-    const r = Math.min(255, Math.max(0, (num >> 16) + amt * 2));
-    const b = Math.min(255, Math.max(0, ((num >> 8) & 0xff) + amt * 2));
-    const g = Math.min(255, Math.max(0, (num & 0xff) + amt * 2));
-
-    return `${usePound ? "#" : ""}${(g | (b << 8) | (r << 16)).toString(16).padStart(6, "0")}`;
-}
-
-function getContrastYIQ(hexcolor) {
-    let colorrgb = colorRgb(hexcolor);
-    let colors = colorrgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
-    let red = colors[1];
-    let green = colors[2];
-    let blue = colors[3];
-    let brightness = (red * 299) + (green * 587) + (blue * 114);
-    brightness = brightness / 255000;
-    return brightness >= 0.5 ? "light" : "dark";
-}
-
-function colorRgb(str) {
-    const HEX_SHORT_REGEX = /^#([0-9a-fA-f]{3})$/;
-    const HEX_LONG_REGEX = /^#([0-9a-fA-f]{6})$/;
-    const HEX_SHORT_LENGTH = 4;
-
-    if (!str || typeof str !== 'string') {
-        return str;
-    }
-
-    const sColor = str.toLowerCase();
-    let hexValue = "";
-
-    if (sColor && (HEX_SHORT_REGEX.test(sColor) || HEX_LONG_REGEX.test(sColor))) {
-        hexValue = sColor.length === HEX_SHORT_LENGTH ?
-            sColor.replace(/^#(.)/g, "#$1$1") :
-            sColor;
-
-        const rgbValue = hexValue.slice(1)
-            .match(/.{2}/g)
-            .map(val => parseInt(val, 16));
-
-        return `rgb(${rgbValue[0]}, ${rgbValue[1]}, ${rgbValue[2]})`;
-    } else {
-        return sColor;
-    }
+const rgbToHex = ([r, g, b]) => {
+  const hex = '#' + [r, g, b].map(x => {
+    const component = Math.floor(x * 0.8);
+    const hexValue = component.toString(16);
+    return hexValue.length === 1 ? '0' + hexValue : hexValue;
+  }).join('');
+  return hex;
 }
 
 function setThemeColors(value, r = null, g = null, b = null) {
@@ -139,4 +67,4 @@ function setThemeColors(value, r = null, g = null, b = null) {
         document.documentElement.style.setProperty('--efu-main-none', 'var(--efu-theme-none)');
         initThemeColor();
     }
-}
+}

package/source/js/main.js

@@ -666,7 +666,7 @@ window.refreshFn = () => {
   runtime && sco.addRuntime();
   [scrollFn, sidebarFn, sco.addPhotoFigcaption, sco.setTimeState, sco.tagPageActive, sco.categoriesBarActive, sco.listenToPageInputPress, sco.addNavBackgroundInit, sco.refreshWaterFall].forEach(fn => fn());
   lazyload.enable && utils.lazyloadImg();
-  lightbox && utils.lightbox(document.querySelectorAll("#article-container img:not(.flink-avatar,.gallery-group img)"));
+  lightbox && utils.lightbox(document.querySelectorAll("#article-container img:not(.flink-avatar,.gallery-group img, .no-lightbox)"));
   randomlink && randomLinksList();
   post_ai && is_post && efu_ai.init();
   sco.switchComments();

package/source/js/utils.js

@@ -101,12 +101,6 @@
         },
         isMobile: () => /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),
         isHidden: e => 0 === e.offsetHeight && 0 === e.offsetWidth,
-        addEventListenerPjax: (ele, event, fn, option = false) => {
-            ele.addEventListener(event, fn, option)
-            utils.addGlobalFn('pjax', () => {
-                ele.removeEventListener(event, fn, option)
-            })
-        },
         animateIn: (ele, text) => {
             Object.assign(ele.style, {display: 'block', animation: text});
         },
@@ -205,4 +199,4 @@
         },
     }
     window.utils = {...window.utils, ...utilsFn};
-})()
+})()

package/.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-indent_style = space
-indent_size = 2

package/.github/workflows/stale.yml

@@ -1,19 +0,0 @@
-name: 'Close stale issues and PRs'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v5
-        with:
-          days-before-issue-stale: 30
-          days-before-pr-stale: -1
-          days-before-close: 7
-          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
-          close-pr-message: 'This issue has not seen any activity since it was marked stale. Closing.'
-          stale-issue-label: 'Stale'
-          exempt-issue-labels: 'pinned,bug,enhancement,documentation,Plan'
-          operations-per-run: 1000