fix: mac support for "control" key

Author: feildmaster

src/base/chat/context.js

@@ -9,6 +9,7 @@ import ignoreUser from 'src/utils/ignoreUser.js';
 import decode from 'src/utils/decode.js';
 import { buttonCSS, window } from 'src/utils/1.variables.js';
 import Translation from 'src/structures/constants/translation.ts';
+import isCtrl from 'src/utils/isCtrl';
 
 const setting = settings.register({
   name: Translation.Setting('chat.rightclick'),
@@ -98,7 +99,7 @@ eventManager.on('jQuery', () => {
     mute.append(' ', muteTime);
 
     function open(event) {
-      if (event.ctrlKey || setting.value()) return;
+      if (isCtrl(event) || setting.value()) return;
       if (toast) {
         toast.close('opened');
       }

src/base/library/craft/max.js

@@ -6,6 +6,7 @@ import onPage from 'src/utils/onPage.js';
 import * as hover from 'src/utils/hover.js';
 import * as cardHelper from 'src/utils/cardHelper.js';
 import Translation from 'src/structures/constants/translation.js';
+import isCtrl from 'src/utils/isCtrl.js';
 import setBypass from './protection.js';
 
 const setting = settings.register({
@@ -50,7 +51,7 @@ onPage('Crafting', function craftMax() {
     card.off('click').on('click.script', (e) => {
       const id = parseInt(card.attr('id'), 10);
       const shiny = card.hasClass('shiny');
-      if (e.ctrlKey) {
+      if (isCtrl(e)) {
         hover.hide();
         const count = max - cardHelper.quantity(el);
         if (count <= 0) return;

src/base/library/deck/random.js

@@ -102,8 +102,8 @@ eventManager.on(':preload:Decks', () => {
   clearDeck.after(' ', button);
 });
 
-function getMode({ ctrlKey = false, shiftKey = false }) {
-  if (ctrlKey) return true;
+function getMode({ ctrlKey = false, metaKey = false, shiftKey = false }) {
+  if (ctrlKey || metaKey) return true;
   if (shiftKey) return false;
   return undefined;
 }

src/base/library/deck/storage.js

@@ -11,6 +11,7 @@ import { cardName } from 'src/utils/cardHelper.js';
 import { translateText } from 'src/utils/translate';
 import { getTranslationArray } from 'src/base/underscript/translation';
 import Translation from 'src/structures/constants/translation.ts';
+import isCtrl from 'src/utils/isCtrl';
 
 // TODO: translation
 const setting = settings.register({
@@ -220,10 +221,11 @@ onPage('Decks', function deckStorage() {
             saveButton();
             return;
           }
-          if (e.ctrlKey && e.shiftKey) { // Crazy people...
+          const ctrlKey = isCtrl(e);
+          if (ctrlKey && e.shiftKey) { // Crazy people...
             return;
           }
-          if (e.ctrlKey) { // ERASE
+          if (ctrlKey) { // ERASE
             localStorage.removeItem(nameKey);
             localStorage.removeItem(deckKey);
             refreshHover(); // Update

src/base/store/buyPacks.js

@@ -5,6 +5,7 @@ import wrap from 'src/utils/2.pokemon.js';
 import sleep from 'src/utils/sleep.js';
 import * as api from 'src/utils/4.api.js';
 import Translation from 'src/structures/constants/translation.ts';
+import isCtrl from 'src/utils/isCtrl.js';
 import { getTranslationArray } from '../underscript/translation.js';
 
 wrap(() => {
@@ -39,7 +40,7 @@ wrap(() => {
   }
 
   function getCount(e, cost, baseCost) {
-    if (e.ctrlKey) return Math.floor(parseInt($(cost ? '#ucp' : '#golds').text(), 10) / baseCost);
+    if (isCtrl(e)) return Math.floor(parseInt($(cost ? '#ucp' : '#golds').text(), 10) / baseCost);
     if (e.altKey) return 10;
     return 1;
   }

src/base/store/quickPacks.js

@@ -11,6 +11,7 @@ import { getCollection } from 'src/utils/user.js';
 import { buttonCSS as css, window } from 'src/utils/1.variables.js';
 import Item from 'src/structures/constants/item.js';
 import length from 'src/utils/length';
+import isCtrl from 'src/utils/isCtrl';
 
 onPage('Packs', async function quickOpenPack() {
   const collection = await getCollection();
@@ -281,7 +282,7 @@ onPage('Packs', async function quickOpenPack() {
     });
     // TODO: translation
     $('[id^="btnOpen"]').on('click.script', (event) => {
-      autoOpen = event.ctrlKey;
+      autoOpen = isCtrl(event);
       const type = $(event.target).prop('id').substring(7);
       const count = autoOpen ? 1 : parseInt($(`#nb${type}Packs`).text(), 10);
       if (event.shiftKey) {

src/base/vanilla/pageShortcuts.js

@@ -3,14 +3,15 @@ import * as settings from 'src/utils/settings/index.js';
 import { global, globalSet } from 'src/utils/global.js';
 import * as hover from 'src/utils/hover.js';
 import Translation from 'src/structures/constants/translation.ts';
+import isCtrl from 'src/utils/isCtrl';
 
 const disable = settings.register({
   name: Translation.Setting('page.jump'),
   key: 'underscript.disable.quickpages',
 });
 
 function ignoring(e) {
-  const ignore = disable.value() || !e.ctrlKey;
+  const ignore = disable.value() || !isCtrl(e);
   if (ignore && [0, global('getMaxPage')()].includes(global('currentPage'))) hover.hide();
   return ignore;
 }

src/utils/isCtrl.js

@@ -0,0 +1,6 @@
+/**
+ * @param {KeyboardEvent} event
+ */
+export default function isCtrl(event) {
+  return event.ctrlKey || event.metaKey;
+}