chore: reuse buttonCSS

feildmaster · feildmaster · commit 41e742d73123 · 2025-03-27T17:16:42.000-05:00
diff --git a/src/base/chat/context.js b/src/base/chat/context.js
@@ -8,6 +8,7 @@ import * as fnUser from '../../utils/user.js';
 import ignoreUser from '../../utils/ignoreUser.js';
 import decode from '../../utils/decode.js';
 import css from '../../utils/css.js';
+import { buttonCSS } from '../../utils/1.variables.js';
 
 const setting = settings.register({
   name: 'Disable Chat Context (right click)',
@@ -144,14 +145,7 @@ eventManager.on('jQuery', () => {
                 'background-color': 'rgba(208, 0, 0, 0.6)',
               },
               buttons: [{
-                css: {
-                  border: '',
-                  height: '',
-                  background: '',
-                  'font-size': '',
-                  margin: '',
-                  'border-radius': '',
-                },
+                css: buttonCSS,
                 text: 'Undo',
                 className: 'dismiss',
                 onclick: () => {
diff --git a/src/base/chat/largeIconMode.js b/src/base/chat/largeIconMode.js
@@ -1,3 +1,4 @@
+import { buttonCSS as css } from '../../utils/1.variables.js';
 import { infoToast } from '../../utils/2.toasts.js';
 import eventManager from '../../utils/eventManager.js';
 import * as settings from '../../utils/settings/index.js';
@@ -34,14 +35,7 @@ eventManager.on('ChatDetected', () => {
   const buttons = {
     text: value ? 'Revert it!' : 'Enable it!',
     className: 'dismiss',
-    css: {
-      border: '',
-      height: '',
-      background: '',
-      'font-size': '',
-      margin: '',
-      'border-radius': '',
-    },
+    css,
     onclick: (e) => {
       setting.set(!value);
     },
diff --git a/src/base/chat/notify.new.js b/src/base/chat/notify.new.js
@@ -5,6 +5,7 @@ import pendingIgnore from '../../utils/pendingIgnore.js';
 import pingRegex from '../../utils/pingRegex.js';
 import { pingExtras } from './toast.js';
 import { infoToast } from '../../utils/2.toasts.js';
+import { buttonCSS } from '../../utils/1.variables.js';
 
 const setting = settings.register({
   name: 'Disable Chat Ping <span style="color: yellow;">(highlighting)</span>',
@@ -74,12 +75,7 @@ function notify() {
     className: 'dismissable',
     css: {
       button: {
-        border: '',
-        height: '',
-        background: '',
-        'font-size': '',
-        margin: '',
-        'border-radius': '',
+        ...buttonCSS,
         'white-space': 'normal',
       },
     },
diff --git a/src/base/friendship/magic.js b/src/base/friendship/magic.js
@@ -3,6 +3,7 @@ import eventManager from '../../utils/eventManager.js';
 import * as settings from '../../utils/settings/index.js';
 import { toast } from '../../utils/2.toasts.js';
 import getLevel from '../../utils/getFriendshipLevel.js';
+import { buttonCSS as css } from '../../utils/1.variables.js';
 
 const setting = settings.register({
   name: 'Disable Friendship Notification',
@@ -31,14 +32,7 @@ function getFriendship() {
       buttons: {
         text: 'Go now!',
         className: 'dismiss',
-        css: {
-          border: '',
-          height: '',
-          background: '',
-          'font-size': '',
-          margin: '',
-          'border-radius': '',
-        },
+        css,
         onclick: (e) => {
           location.href = '/Friendship';
         },
diff --git a/src/base/game/hotkeys/endTurn.js b/src/base/game/hotkeys/endTurn.js
@@ -3,7 +3,7 @@ import * as settings from '../../../utils/settings/index.js';
 import { global } from '../../../utils/global.js';
 import { infoToast } from '../../../utils/2.toasts.js';
 import Hotkey from '../../../utils/hotkey.class.js';
-import { hotkeys } from '../../../utils/1.variables.js';
+import { buttonCSS as css, hotkeys } from '../../../utils/1.variables.js';
 import { BUTTON as MOUSE_BUTTON } from '../../../utils/mouse.js';
 
 const fullDisable = settings.register({
@@ -46,14 +46,7 @@ eventManager.on('PlayingGame', function bindHotkeys() {
       buttons: {
         text: 'Open Settings',
         className: 'dismiss',
-        css: {
-          border: '',
-          height: '',
-          background: '',
-          'font-size': '',
-          margin: '',
-          'border-radius': '',
-        },
+        css,
         onclick: (_) => {
           settings.open('Game');
         },
diff --git a/src/base/plugin/enabled.local.js b/src/base/plugin/enabled.local.js
@@ -1,4 +1,4 @@
-import { buttonCSS } from '../../utils/1.variables.js';
+import { buttonCSS as css } from '../../utils/1.variables.js';
 import wrap from '../../utils/2.pokemon.js';
 import { registerModule } from '../../utils/plugin.js';
 import * as settings from '../../utils/settings/index.js';
@@ -47,14 +47,14 @@ wrap(() => {
         },
         buttons: [{
           text: isEnabled ? 'Disable' : 'Enable',
-          css: buttonCSS,
+          css,
           onclick() {
             enabled.set(!isEnabled);
             registered.set(true);
           },
         }, {
           text: 'Dismiss',
-          css: buttonCSS,
+          css,
           onclick() {
             enabled.set(isEnabled);
             registered.set(true);
diff --git a/src/base/store/quickPacks.js b/src/base/store/quickPacks.js
@@ -8,6 +8,7 @@ import { blankToast, toast as basicToast } from '../../utils/2.toasts.js';
 import * as api from '../../utils/4.api.js';
 import formatNumber from '../../utils/formatNumber.js';
 import { getCollection } from '../../utils/user.js';
+import { buttonCSS as css } from '../../utils/1.variables.js';
 
 onPage('Packs', async function quickOpenPack() {
   const collection = await getCollection();
@@ -138,14 +139,7 @@ onPage('Packs', async function quickOpenPack() {
         buttons: {
           text: 'Stop',
           className: 'dismiss',
-          css: {
-            border: '',
-            height: '',
-            background: '',
-            'font-size': '',
-            margin: '',
-            'border-radius': '',
-          },
+          css,
           onclick: (e) => {
             events.emit('cancel');
           },
diff --git a/src/base/streamer/message.private.js b/src/base/streamer/message.private.js
@@ -5,6 +5,7 @@ import { toast } from '../../utils/2.toasts.js';
 import { debug } from '../../utils/debug.js';
 import each from '../../utils/each.js';
 import streaming from './0.streamer.js';
+import { buttonCSS as css } from '../../utils/1.variables.js';
 
 /* eslint-disable no-multi-assign */
 // Toast for private messages while streaming mode is on
@@ -50,14 +51,7 @@ eventManager.on('preChat:getPrivateMessage', function streamerMode(data) {
   toasts[userId] = toast({
     text: `Message from ${user.name(user)}`,
     buttons: [{
-      css: {
-        border: '',
-        height: '',
-        background: '',
-        'font-size': '',
-        margin: '',
-        'border-radius': '',
-      },
+      css,
       text: 'Open',
       className: 'dismiss',
       onclick: () => {
diff --git a/src/base/underscript/updates.js b/src/base/underscript/updates.js
@@ -8,7 +8,7 @@ import { toast as BasicToast } from '../../utils/2.toasts.js';
 import sleep from '../../utils/sleep.js';
 import * as menu from '../../utils/menu.js';
 import semver from '../../utils/version.js';
-import { scriptVersion } from '../../utils/1.variables.js';
+import { buttonCSS, scriptVersion } from '../../utils/1.variables.js';
 import css from '../../utils/css.js';
 import { captureError } from '../../utils/sentry.js';
 
@@ -99,34 +99,26 @@ wrap(() => {
     latest.set(data);
     if (updateToast) updateToast.close('stale');
     const path = `underscript@${data.version}/${data.unpkg}`;
-    const baseStyle = {
-      border: '',
-      height: '',
-      background: '',
-      'font-size': '',
-      margin: '',
-      'border-radius': '',
-    };
     updateToast = BasicToast({
       title: '[UnderScript] Update Available!',
       text: `Version ${data.version}.`,
       className: 'dismissable',
       buttons: [{
         text: 'Update (github)',
         className: 'dismiss',
-        css: baseStyle,
+        css: buttonCSS,
       }, {
         text: 'Update (unpkg)',
         className: 'dismiss',
-        css: baseStyle,
+        css: buttonCSS,
         onclick(e) {
           location.href = `${baseURL}/${path}`;
           updateToast.close('update');
         },
       }, {
         text: 'Update (jsdelivr)',
         className: 'dismiss',
-        css: baseStyle,
+        css: buttonCSS,
         onclick: (e) => {
           location.href = `https://cdn.jsdelivr.net/npm/${path}`;
           updateToast.close('update');
diff --git a/src/utils/1.variables.js b/src/utils/1.variables.js
@@ -3,6 +3,14 @@ export const footer = '<div style="width:100%;text-align:center;font-size:12px;f
 export const footer2 = '<div style="width:100%;text-align:center;font-size:12px;font-family:monospace;">via UnderScript</div>';
 export const hotkeys = [];
 export const scriptVersion = GM_info.script.version;
+export const buttonCSS = {
+  border: '',
+  height: '',
+  background: '',
+  'font-size': '',
+  margin: '',
+  'border-radius': '',
+};
 
 export const SOCKET_SCRIPT_CLOSED = 3500;
 
diff --git a/src/utils/2.toasts.js b/src/utils/2.toasts.js
@@ -1,3 +1,4 @@
+import { buttonCSS } from './1.variables.js';
 import merge from './merge.js';
 
 export function blankToast() {
@@ -80,14 +81,7 @@ export function dismissable({ title, text, key, value = 'true', css = {} }) {
   const buttons = {
     text: 'Dismiss',
     className: 'dismiss',
-    css: {
-      border: '',
-      height: '',
-      background: '',
-      'font-size': '',
-      margin: '',
-      'border-radius': '',
-    },
+    css: buttonCSS,
     onclick: (e) => {
       localStorage.setItem(key, value);
     },
diff --git a/src/utils/notifications.js b/src/utils/notifications.js
@@ -2,6 +2,7 @@ import * as settings from './settings/index.js';
 import sleep from './sleep.js';
 import eventManager from './eventManager.js';
 import { toast } from './2.toasts.js';
+import { buttonCSS as css } from './1.variables.js';
 
 const setting = settings.register({
   key: 'underscript.notification.dismissPrompt',
@@ -35,14 +36,6 @@ if (isType() && !setting.value()) {
 }
 
 function show(text = 'UnderScript would like to send notifications.') {
-  const css = {
-    border: '',
-    height: '',
-    background: '',
-    'font-size': '',
-    margin: '',
-    'border-radius': '',
-  };
   const buttons = [{
     css,
     text: 'Request Permission',
diff --git a/src/utils/settings/types/map.js b/src/utils/settings/types/map.js
@@ -9,7 +9,10 @@ export default class MapList extends Setting {
     return new Map();
   }
 
-  element(val = new Map(), update, { container }) {
+  /**
+   * @param {Map<string, string>} val
+   */
+  element(val, update, { container }) {
     const data = [...val.entries()];
     function invalid(text) {
       return data.some(([value]) => value === text);
