From 97239557f74085d2cc2b373b3147d4a36820a639 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sat, 4 Nov 2023 13:38:02 -0400 Subject: [PATCH] refactor(ags): make custom services global for outside access --- devices/wim/config/ags/.eslintrc.json | 3 ++- devices/wim/config/ags/config.js | 6 ++++++ devices/wim/config/ags/js/misc/closer.js | 3 --- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/devices/wim/config/ags/.eslintrc.json b/devices/wim/config/ags/.eslintrc.json index 62ed041c..de8763c6 100644 --- a/devices/wim/config/ags/.eslintrc.json +++ b/devices/wim/config/ags/.eslintrc.json @@ -32,7 +32,8 @@ "no-useless-escape": ["off"] }, "globals": { - "ags": "readonly", + "Tablet": "readonly", + "Pointers": "readonly", "ARGV": "readonly", "imports": "readonly", "print": "readonly", diff --git a/devices/wim/config/ags/config.js b/devices/wim/config/ags/config.js index 7c4c1190..5ded7bd0 100644 --- a/devices/wim/config/ags/config.js +++ b/devices/wim/config/ags/config.js @@ -4,6 +4,12 @@ Array.prototype.remove = function (el) { this.splice(this.indexOf(el), 1); }; import App from 'resource:///com/github/Aylur/ags/app.js'; import { exec, execAsync } from 'resource:///com/github/Aylur/ags/utils.js'; +import Tablet from './services/tablet.js'; +globalThis.Tablet = Tablet; + +import Pointers from './services/pointers.js'; +globalThis.Pointers = Pointers; + import closeAll from './js/misc/closer.js'; globalThis.closeAll = closeAll; diff --git a/devices/wim/config/ags/js/misc/closer.js b/devices/wim/config/ags/js/misc/closer.js index 16d95d12..94c8e06a 100644 --- a/devices/wim/config/ags/js/misc/closer.js +++ b/devices/wim/config/ags/js/misc/closer.js @@ -1,8 +1,5 @@ import App from 'resource:///com/github/Aylur/ags/app.js'; -// TODO: find a way to not need this? -import Pointers from '../../services/pointers.js'; - export default () => { Array.from(App.windows)