From 2f42f036ec04e00714c85a5e4f93fbb40b009def Mon Sep 17 00:00:00 2001 From: liuzhihang Date: Fri, 4 Nov 2022 09:09:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9B=BE=E7=89=87=E4=B8=BB?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/assets/js/main.js | 7 ++--- templates/assets/js/utils.js | 11 ------- templates/assets/zhheo/blogex.js | 41 +++++++++++++-------------- templates/assets/zhheo/rightmenu.js | 6 ++-- templates/modules/layouts/layout.html | 7 +++-- templates/post.html | 2 +- 6 files changed, 29 insertions(+), 45 deletions(-) diff --git a/templates/assets/js/main.js b/templates/assets/js/main.js index f644f088..eb5ef58e 100644 --- a/templates/assets/js/main.js +++ b/templates/assets/js/main.js @@ -78,11 +78,10 @@ document.addEventListener("DOMContentLoaded", function () { // 滚动处理 const scrollFnToDo = function () { - const isToc = GLOBAL_CONFIG.htmlType === 'post'; - const isAnchor = true; + const isToc = GLOBAL_CONFIG.htmlType === 'post' && document.getElementById("card-toc"); const $article = document.getElementById("article-container"); - if (!($article && (isToc || isAnchor))) return + if (!($article && isToc)) return let $tocLink, $cardToc, scrollPercent, autoScrollToc, isExpand @@ -169,8 +168,6 @@ document.addEventListener("DOMContentLoaded", function () { return } - if (isAnchor) btf.updateAnchor(currentId); - detectItem = currentIndex if (isToc) { diff --git a/templates/assets/js/utils.js b/templates/assets/js/utils.js index fbad8302..d3f6b701 100644 --- a/templates/assets/js/utils.js +++ b/templates/assets/js/utils.js @@ -181,15 +181,4 @@ const btf = { return actualTop }, - updateAnchor: (anchor) => { - if (anchor !== window.location.hash) { - if (!anchor) anchor = location.pathname - const title = "123111111111" - window.history.replaceState({ - url: location.href, - title: title - }, title, anchor) - } - } - }; \ No newline at end of file diff --git a/templates/assets/zhheo/blogex.js b/templates/assets/zhheo/blogex.js index 044ead3a..9cd3ec34 100644 --- a/templates/assets/zhheo/blogex.js +++ b/templates/assets/zhheo/blogex.js @@ -66,6 +66,7 @@ function checkOpen() { // 效果比较低微，这块应该添加配置项 // 用户选择是否开启主色调背景 // 然后选择是使用图床的 API 获取主色还是选择使用 js 获取 +// https://lokeshdhakar.com/projects/color-thief/ function coverColor() { let img = document.getElementById("post-cover"); @@ -74,26 +75,31 @@ function coverColor() { const colorThief = new ColorThief(); - const img = new Image(); + // Make sure image is finished loading + if (img.complete) { + loadColor(colorThief.getColor(img)); + } else { + img.addEventListener('load', function () { + loadColor(colorThief.getColor(img)); + }); + } - img.addEventListener('load', function () { - let value = colorThief.getColor(img); - value = rgbToHex(value[0], value[1], value[1]); + function loadColor(rgbColor) { - if ("light" === getContrastYIQ(value)) { - value = LightenDarkenColor(colorHex(value), -40); - document.styleSheets[0].addRule(":root", "--heo-main:" + value + "!important"); - document.styleSheets[0].addRule(":root", "--heo-main-op:" + value + "23!important"); - document.styleSheets[0].addRule(":root", "--heo-main-none:" + value + "00!important"); + let hexColor = rgbToHex(rgbColor[0], rgbColor[1], rgbColor[2]); + + if ("light" === getContrastYIQ(hexColor)) { + hexColor = LightenDarkenColor(colorHex(hexColor), -40); + document.styleSheets[0].addRule(":root", "--heo-main:" + hexColor + "!important"); + document.styleSheets[0].addRule(":root", "--heo-main-op:" + hexColor + "23!important"); + document.styleSheets[0].addRule(":root", "--heo-main-none:" + hexColor + "00!important"); heo.initThemeColor(); document.getElementById("coverdiv").classList.add("loaded"); } - }); + } - img.crossOrigin = 'Anonymous'; - img.src = path; } else { document.styleSheets[0].addRule(":root", "--heo-main: var(--heo-theme)!important"); @@ -284,16 +290,7 @@ document.getElementById("post-comment") && owoBig(), document.addEventListener(" var e, t = window.scrollY + document.documentElement.clientHeight, o = (window.scrollY, document.getElementById("pagination")), n = document.getElementById("post-tools"); n && o && (e = n.offsetTop + n.offsetHeight / 2, 1300 < document.body.clientWidth && (e < t ? o.classList.add("show-window") : o.classList.remove("show-window"))) -}, 200)), "false" !== localStorage.getItem("keyboardToggle") ? document.querySelector("#consoleKeyboard").classList.add("on") : document.querySelector("#consoleKeyboard").classList.remove("on"), $(window).on("keydown", function (e) { - if (27 == e.keyCode && (heo.hideLoading(), heo.hideConsole(), rm.hideRightMenu()), heo_keyboard && e.shiftKey) { - if (65 == e.keyCode) return heo.showConsole(), !1; - if (77 == e.keyCode) return heo.musicToggle(), !1; - if (82 == e.keyCode) return toRandomPost(), !1; - if (66 == e.keyCode) return pjax.loadUrl("/"), !1; - if (68 == e.keyCode) return rm.switchDarkMode(), !1; - if (70 == e.keyCode) return pjax.loadUrl("/moments/"), !1 - } -}); +}, 200)); document.addEventListener("pjax:send", function () { heo.showLoading() diff --git a/templates/assets/zhheo/rightmenu.js b/templates/assets/zhheo/rightmenu.js index 44ced867..22f75cf2 100644 --- a/templates/assets/zhheo/rightmenu.js +++ b/templates/assets/zhheo/rightmenu.js @@ -252,9 +252,9 @@ function addRightMenuClickEvent() { $("#menu-home").on("click", function () { window.location.href = window.location.origin; }), - $("#menu-randomPost").on("click", function () { - toRandomPost(); - }), + // $("#menu-randomPost").on("click", function () { + // toRandomPost(); + // }), $("#menu-commentBarrage").on("click", heo.switchCommentBarrage), $("#rightmenu-mask").on("click", rm.hideRightMenu), $("#rightmenu-mask").contextmenu(function () { diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html index 284c7417..9fad4d89 100644 --- a/templates/modules/layouts/layout.html +++ b/templates/modules/layouts/layout.html @@ -64,15 +64,16 @@ + + +
- -