From 2863f2fc64670b0689fd336aa7d1d46cb1e71ddc Mon Sep 17 00:00:00 2001 From: boomzero Date: Sat, 14 Jun 2025 09:34:06 +0800 Subject: [PATCH 1/4] feat: Enhance keyboard shortcuts for better cross-platform support - Updated keyboard shortcuts to support both `Ctrl` and `Cmd` keys for macOS and Windows/Linux users. - Improved consistency across multiple event listeners for actions like form submission and button clicks. --- XMOJ.user.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/XMOJ.user.js b/XMOJ.user.js index 4e01002d..185588ef 100644 --- a/XMOJ.user.js +++ b/XMOJ.user.js @@ -1075,7 +1075,7 @@ window.addEventListener('DOMContentLoaded', async () => { // Remove the preloader style now that the page is loading and Bootstrap 5 will take over. const preloadStyleElement = document.getElementById('tampermonkey-dark-preload'); if (preloadStyleElement) { - preloadStyleElement.remove(); + preloadStyleElement.remove(); console.log("Removed minimal dark preload styles."); } fetch(ServerURL + "/Update.json", {cache: "no-cache"}) @@ -2233,7 +2233,7 @@ window.addEventListener('DOMContentLoaded', async () => { if (Submitted) location.reload(); else AutoCheatButton.innerHTML = "自动提交当年代码"; }); document.addEventListener("keydown", (Event) => { - if (Event.code === 'Enter' && Event.ctrlKey) { + if (Event.code === 'Enter' && (Event.metaKey || Event.ctrlKey)) { AutoCheatButton.click(); } }); @@ -4211,7 +4211,7 @@ int main() TurnstileScript.src = "https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit&onload=CaptchaLoadedCallback"; document.body.appendChild(TurnstileScript); ContentElement.addEventListener("keydown", (Event) => { - if (Event.ctrlKey && Event.keyCode == 13) { + if ((Event.metaKey || Event.ctrlKey) && Event.keyCode == 13) { SubmitElement.click(); } }); @@ -4388,7 +4388,7 @@ int main() TurnstileScript.src = "https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit&onload=CaptchaLoadedCallback"; document.body.appendChild(TurnstileScript); ContentElement.addEventListener("keydown", (Event) => { - if (Event.ctrlKey && Event.keyCode == 13) { + if ((Event.metaKey || Event.ctrlKey) && Event.keyCode == 13) { SubmitElement.click(); } }); @@ -4642,7 +4642,7 @@ int main() ContentEditor.value = ContentEditor.value.substring(0, ContentEditor.value.indexOf("
")); } ContentEditor.addEventListener("keydown", (Event) => { - if (Event.ctrlKey && Event.keyCode == 13) { + if ((Event.metaKey || Event.ctrlKey) && Event.keyCode == 13) { OKButton.click(); } }); From acfe7cf7927633d67a0a83662fc28d1cb73ec5d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 14 Jun 2025 01:35:55 +0000 Subject: [PATCH 2/4] 1.7.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30153282..76b8b358 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xmoj-script", - "version": "1.7.1", + "version": "1.7.2", "description": "an improvement script for xmoj.tech", "main": "AddonScript.js", "scripts": { From 5bff16be4a9d7a397405ef3fe16fb9e16b09f9e7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 14 Jun 2025 01:36:01 +0000 Subject: [PATCH 3/4] Update version info to 1.7.2 --- Update.json | 11 +++++++++++ XMOJ.user.js | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Update.json b/Update.json index afebbac9..ecb9baef 100644 --- a/Update.json +++ b/Update.json @@ -2862,6 +2862,17 @@ } ], "Notes": "No release notes were provided for this release." + }, + "1.7.2": { + "UpdateDate": 1749864956162, + "Prerelease": true, + "UpdateContents": [ + { + "PR": 808, + "Description": "feat: Enhance keyboard shortcuts for better cross-platform support" + } + ], + "Notes": "No release notes were provided for this release." } } } \ No newline at end of file diff --git a/XMOJ.user.js b/XMOJ.user.js index 185588ef..6075d804 100644 --- a/XMOJ.user.js +++ b/XMOJ.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name XMOJ -// @version 1.7.1 +// @version 1.7.2 // @description XMOJ增强脚本 // @author @XMOJ-Script-dev, @langningchen and the community // @namespace https://github/langningchen From a703618d389b414da0a17416db62eb915179616a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 14 Jun 2025 01:36:56 +0000 Subject: [PATCH 4/4] Update time and description of 1.7.2 --- Update.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update.json b/Update.json index ecb9baef..ce92ef55 100644 --- a/Update.json +++ b/Update.json @@ -2864,7 +2864,7 @@ "Notes": "No release notes were provided for this release." }, "1.7.2": { - "UpdateDate": 1749864956162, + "UpdateDate": 1749865010938, "Prerelease": true, "UpdateContents": [ {