Additional AardGL fixes

.babelrc

@@ -1,13 +1,13 @@
 {
   "plugins": [
-    "@babel/plugin-proposal-class-properties"
+    "@babel/plugin-proposal-optional-chaining"
   ],
   "presets": [
     ["@babel/preset-env", {
       "useBuiltIns": false,
       "targets": {
-        "esmodules": true
+        "esmodules": true,
-      }
+      },
     }]
   ]
 }

.gitignore

@@ -9,9 +9,3 @@ build/
 *.pem
 
 *.kate-swp
-
-src/res/img/git-ignore/
-
-test/debug-configs/
-
-debugging-resources/

.gitlab-ci.yml

@@ -0,0 +1,23 @@
+image: node:current
+
+cache:
+  paths:
+  - node_modules/
+  - .yarn
+
+stages:
+  - prep
+  - build
+  - pack
+
+install deps:
+  stage: prep
+  script: yarn install
+
+build:
+  stage: build
+  script: npm run build
+
+create zip:
+  stage: pack
+  script: npm run build-zip

.nvmrc

@@ -1 +1 @@
-14.21.3
+14.4.0

.vscode/extensions.json

@@ -1,8 +0,0 @@
-{
-    "recommendations": [
-        "hollowtree.vue-pack",
-        "msjsdiag.debugger-for-chrome",
-        "firefox-devtools.vscode-firefox-debug",
-        "msjsdiag.debugger-for-edge"
-    ]
-}

.vscode/launch.json

@@ -1,52 +1,29 @@
 {
-  // Use IntelliSense to learn about possible attributes.
+    // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
+    // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
+    "version": "0.2.0",
-  "configurations": [
+    "configurations": [
-
-    {
-      "type": "chrome",
-      "request": "attach",
-      "name": "Attach to Chrome",
-      "port": 9222,
-      "urlFilter": "http://*/*",
-      "webRoot": "${workspaceFolder}"
-    },
-    {
-      "type": "firefox",
-      "request": "attach",
-      "name": "Attach (firefox)",
-      "pathMappings": [
         {
-          "url": "webpack:///ext",
+            "name": "Launch addon",
-          "path": "${workspaceFolder}/src/ext"
+            "type": "firefox",
+            "request": "launch",
+            "port": 6000,
+            "reAttach": true,
+            "addonType": "webExtension",
+            "addonPath": "${workspaceFolder}/dist-ff",
+            "pathMappings": [
+                {
+                    "url": "webpack:///",
+                    "path": "${workspaceFolder}/src/"
+                }
+            ]
         }
-      ]
+    ],
-    },
+    "firefox": {
-    {
+        "executable": "/usr/bin/firefox-developer-edition",
-      "name": "Launch addon (firefox)",
+        "firefoxArgs": [
-      "type": "firefox",
+            "--start-debugger-server"
-      "request": "launch",
+        ]
-      "port": 6000,
-      "reAttach": true,
-      "addonType": "webExtension",
-      "addonPath": "${workspaceFolder}/dist-ff",
-      "pathMappings": [
-        {
-          "url": "webpack:///ext",
-          "path": "${workspaceFolder}/src/ext"
-        },
-      ]
     }
-  ],
+}
-  "firefox": {
-    "executable": "/usr/bin/firefox-developer-edition",
-    "firefoxArgs": [
-      "--start-debugger-server"
-    ]
-  },
-  "chrome": {
-    "executable": "/usr/bin/google-chrome-stable --remote-debugging-port=9222",
-  }
-}

.vscode/settings.json

@@ -1,5 +1,7 @@
 {
   "cSpell.words": [
+    "PILLARBOX",
+    "PILLARBOXED",
     "aard",
     "ardetector",
     "autodetect",
@@ -9,38 +11,26 @@
     "blackbars",
     "blackframe",
     "canvas",
-    "clickthrough",
     "com",
     "comms",
     "csui",
     "decycle",
-    "dinked",
-    "dinks",
     "disneyplus",
-    "endregion",
     "equalish",
-    "fith",
-    "fitw",
     "fuckup",
     "gfycat",
     "gmail",
     "guardline",
     "han",
-    "haram",
     "iframe",
     "imgur",
     "insta",
     "letterboxed",
     "manjaro",
-    "mdicon",
-    "mdijs",
     "minification",
-    "mitigations",
     "nogrow",
     "noshrink",
     "outro",
-    "PILLARBOX",
-    "PILLARBOXED",
     "polyfill",
     "recursing",
     "reddit",
@@ -53,8 +43,8 @@
     "tabitem",
     "tablist",
     "tamius",
+    "stdev",
     "textbox",
-    "ultrawide",
     "ultrawidify",
     "unmark",
     "unmarking",
@@ -83,4 +73,4 @@
     "undisable",
     "vdid"
   ]
-}
+}

CHANGELOG.md

@@ -1,183 +1,19 @@
 # Changelog
 
-
+## v4.x
 
 ### Plans for the future
 
-* Native builds for Chromium Edge
+* WebGL
+* Native builds for Chromium Edge and Opera
 * Settings page looks ugly af right now. Maybe fix it some time later
 * other bug fixes
 
-## v7.0 (planned major)
+QoL improvements for me:
- * WebGL autodetection
 
-## v6.0 (current major)
+* logging: allow to enable logging at will and export said logs to a file
 
-### v6.0.1
+### v4.4.8 (Current)
-
-* Fixed external links
-
-### v6.0.0
-
-Chrome only, because I needed to rush manifest v3 migration before ensuring things work in Firefox.
-
- * In player UI
- * New alignment options (can align video both vertically, as well as horizontally)
- * Extension does a little bit of a better job differentiating between levels of support for a given site
- * Changed how cropping and panning works. This should lead to fewer problems and better generic support.
-  * REGRESSION: no manual panning with shift + mouse movement
- * "Player select" screen, which provides a GUI way for picking HTML element that acts as the video player area
-
-Regressions and potential issues:
- * Settings were largely not migrated from previous versions. This is as intended, since changes to cropping (and some other aspects)
-   rendered certain old settings obsolete.
- * Extension can no longer discriminate between iframes — extension popup commands get sent to ALL iframes on page
- * Extension probably can't discriminate between multiple videos on a single page
-
-## v5.x 
-
-### v5.1.7
-
-Firefox-only.
-
-* When cropping and panning video, CSS' `transform: translate(x,y)` now uses integers _always_. Before that fix, `translate(x,y)` could be offset by x.5 px, and that half of a pixel introduced a 1px thick line on the portion of the left edge of the video.
-
-### v5.1.7
-
-* When aligning videos, ensure video is never translated by a fractional value
-* As of recent nVidia driver update in Edge, Angle detection fails in a way that prevents popup from showing up. This problem should be fixed now.
-
-The angle detection problem was fixed by disabling the angle detection check for now, as Chrome, et al. appear to have fixed buggy video hardware acceleration.
-
-### v5.1.6
-
-* Added new config for disney+ (courtesy of @MStefan99)
-* Chrome hardware acceleration is bugged and cannot be worked around in-extension. Only way to fix this is for users to change their Google Chrome settings. Added naggathon with instructions into the extension popup.
-
-### v5.1.5
-
-* Fixed laginess in Chromium-based browsers on Windows. Details in [#199](https://github.com/tamius-han/ultrawidify/issues/199#issuecomment-1221383134)
-
-### v5.1.4
-
-* Fixed some problems with autodetection not returning to 16:9 when necessary if autodetection already changed aspect ratio ([#198](https://github.com/tamius-han/ultrawidify/issues/198))
-
-### v5.1.3
-
-* Fixed some problems with autodetection sometimes briefly resetting on dark frames ([#195](https://github.com/tamius-han/ultrawidify/issues/195), [#196](https://github.com/tamius-han/ultrawidify/issues/196))
-
-### v5.1.2
-
-* `set-extension-mode` turned into `set-ExtensionMode` at some point. This caused in "Enable this extension" options to vanish on certain setups.
-* Blackframe tests now run on same data as main algorithm as opposed on a smaller sample (`drawImage()` calls are _very_ expensive even for a 16x9 sample).
-
-### v5.1.1
-
-* Fixed autodetection
-
-### v5.1.0
-
-* Re-enable logger
-* Move aspect ratio autodetection to requestAnimationFrame
-* Fix netflix
-
-### v5.0.7
-
-* Videos of square-ish aspect ratios on 1440p (and lower) resolutions now no longer get misaligned ([#162](https://github.com/tamius-han/ultrawidify/issues/162))
-* Alignment of featured videos on youtube channel page should now also be fixed
-
-### v5.0.6
-* Added configuration for metaivi.com based on user feedback ([#160](https://github.com/tamius-han/ultrawidify/issues/160))
-* Removed ExtConfPatches for versions < 4.5.0, because nobody should be using a build of this extension that's over a year old
-
-### v5.0.5
-
-* improved UX a bit
-* Fixed white background on app.plex.tv ([#158](https://github.com/tamius-han/ultrawidify/issues/158))
-
-### v5.0.4
-* Attempt to fix disney+ again, courtesy of [@jwannebo](https://github.com/tamius-han/ultrawidify/issues/84#issuecomment-846334005) on github.
-
-
-### v5.0.3
-
-* Fixed the issue where the videos were sometimes offset up and left. Again.
-* Fix the issue where correcting source stretch was squished incorrectly ([#153](https://github.com/tamius-han/ultrawidify/issues/153))
-
-### v5.0.2
-
-* When in full screen, the extension will assume player element dimensions are the same as the screen resolution. This should help with sites where ultrawidify doesn't correctly identify the player, as cropping generally doesn't work if player element is not identified. Old behaviour can be restored in advanced extension settings by toggling the "use player aspect ratio in fullscreen" checkbox under 'player detection settings'.
-* Extension should now respect 'disable extension' option for real.
-* Fixed the issue where player wouldn't get detected if video was wider than the player.
-
-
-### v5.0.1
-* Added an option for users to turn off (and/or configure) Chrome/Edge's zoom limiter.
-
-### v5.0.0
-
-There's been some big-ish changes under the hood:
-
-* Migrate main scripts to typescript (vue is currently not included).
-* webextension-polyfill is now used everywhere (if only because typescript throws a hissy fit with `browser` and `chrome` otherwise) ([#114](https://github.com/tamius-han/ultrawidify/issues/114))
-* Fix some bugs that I didn't even know I had, but typescript kinda shone some light on them
-* Manual zoom (Z/U unless sites override the two) should now work again (without automatic AR constantly overriding it). Same goes for panning. ([#135](https://github.com/tamius-han/ultrawidify/issues/135) & [#138](https://github.com/tamius-han/ultrawidify/issues/138))
-* Fix issue when video would be scaled incorrectly if video element uses `height:auto`.
-* **[5.0.0.1]** Fixed the issue where settings were reset on page load.
-* **[5.0.0.1]** Fixed the issue where settings page wouldn't load.
-## v4.x (current major)
-
-### v4.5.3
-
-* Provides workaround for the fullscreen stretching bug Chrome 88 (or a recent Windows 10 update) introduced for nVidia users using hardware acceleration on Windows 10. In order to mitigate this bug, Ultrawidify needs to keep a 5-10 px wide black border while watching videos in full screen. This bug is also present in Edge.
-* **[4.5.3.1]** Fixed letterbox misalignment binding in settings (#134)
-* **[4.5.3.2]** Fixed false 'autodetection not supported' notifications.
-
-### v4.5.2
-
-* Fixed the issue where videos would sometimes get misaligned while using hybrid stretch, except for real this time. ([#125](https://github.com/tamius-han/ultrawidify/issues/125))
-* Improved DRM detection (the 'autodetection cannot work on this site' popup should now no longer show up on the sites where autodetection _can_ work)
-
-### v4.5.1
-
-* Fixed the misalignment issue on netflix ... hopefully.
-* 'Site settings' tab should now work in Chrome as well ([#126](https://github.com/tamius-han/ultrawidify/issues/126))
-* Popup interface now refreshes properly ([#127](https://github.com/tamius-han/ultrawidify/issues/127))
-* Videos should now be scaled correctly when the display is narrower than video's native aspect ratio ([#118](https://github.com/tamius-han/ultrawidify/issues/118))
-* Fullscreen videos on streamable are aligned correctly ([#116](https://github.com/tamius-han/ultrawidify/issues/118)).
-* **[4.5.1.1]** Streamable fix broke old.reddit + RES on embeds from v.redd.it and streamable.com. We're now using an alternative implementation. ([#128](https://github.com/tamius-han/ultrawidify/issues/128))
-* **[4.5.1.2]** Fixed the issue where videos would sometimes get misaligned while using hybrid stretch. ([#125](https://github.com/tamius-han/ultrawidify/issues/125))
-* **[4.5.1.3]** Added fix for disney plus
-* **[4.5.1.3]** Microsoft Edge has fixed the bugs that prevented the extension from working properly. Popup should no longer be shown.
-
-
-### v4.5.0 (Current)
-
-* Under the hood: migrated from vue2 to vue3, because optional chaining in templates is too OP.
-* (On options page, section 'Action &amp; shortcuts') Manual aspect ratio now supports entering custom ratios using '21/9' and '2.39:1' formats (as opposed to single number, e.g. '2.39') — [#121](https://github.com/tamius-han/ultrawidify/issues/121).
-* Added config for wakanim.tv (special thanks to @saschanaz for doing the legwork — [#113](https://github.com/tamius-han/ultrawidify/issues/113))
-* (In Firefox) When extension was placed in overflow menu, the popup was cut off. That should be fixed now. [#119](https://github.com/tamius-han/ultrawidify/issues/119)
-* The extension will now show a notification when autodetection can't run due to DRM
-* Videos on facebook and reddit no longer get shifted up and to the left for me (cropping most of the video off-screen), but I haven't been deliberately trying to fix that issue. If you experience that issue, please consider contacting me (via github or email) with a link to a problematic video.
-
-### v4.4.10
-
-* Video alignment should now work on Twitch — [#109](https://github.com/tamius-han/ultrawidify/issues/109)
-* Videos should now align properly on Hulu while cropped — [#111](https://github.com/tamius-han/ultrawidify/issues/111) & via email
-* Fixed a problem where changing certain settings would cause multiple instances of Ultrawidify to run on a page, effectively preventing some crop options to be set until reload. (possibly [#112](https://github.com/tamius-han/ultrawidify/issues/112)?)
-* Fixed a problem where embedded videos would be misaligned after switching from full screen
-* **[4.4.10.1]** Fixed cruncyhroll regression — [#109](https://github.com/tamius-han/ultrawidify/issues/115)
-
-### v4.4.9
-
-* Fixed the youtube alignment issue (previously fixed in v4.4.7.1-2), but this time for real (and in a bit more proper way)
-* Fixed the bug where extension wouldn't work when URL specified a port (e.g. www.example.com:80)
-* **[4.4.9.1]** removed source files from extension build in order to decrease package size
-* **[4.4.9.2]** updated dependencies and stuff
-
-In addition to that, as of 4.4.9.1 the build process ensures removal of `node_modules` before building the extension so we can have reproducible builds except for real this time. Hopefully.
-
-### v4.4.8
 
 * Fixed the bug where on pages with more than one video, the list of available videos in the extension popup wouldn't remove videos that are no longer displayed on site. This resulted in extension listing videos that were no longer on the page. Reboot or navigation would also not clear the list if navigating between various pages on the same host.
 * Fixed the chrome-only bug where on sites with more than one video, the number wouldn't get hidden when the extension popup closed.
@@ -198,7 +34,7 @@ In addition to that, as of 4.4.9.1 the build process ensures removal of `node_mo
 * Fixed netflix (and possibly disney+ )
 * It's been almost a month and Chrome Web Store still hasn't finished the review of the 4.4.4.1 (and 4.4.4.2) revisions because when it comes to incompetence, it's hard to expect anything less from Google. I've did some proverbial yelling at the support in hopes that Chrome version will finally see an update (disclaimer: when I said yelling I really mean a polite request, because support staff doesn't deserve abuse because a different department is utter shite at doing their jobs).
 
-### v4.4.5
+### v4.4.5 
 
 * Extension no longer requires `allTabs` and `webNavigation` permissions
 * Some CSS on the debugger popup was not scoped, causing issues with some sites.
@@ -228,7 +64,7 @@ In addition to that, as of 4.4.9.1 the build process ensures removal of `node_mo
 
 * Changes to player detection that fix issues with vk
 * Extension tries to avoid setting aspect ratio pointlessly
-* (Hopefully) fixed mailto: and reddit compose links.
+* (Hopefully) fixed mailto: and reddit compose links. 
 * When reporting bugs, email/reddit template now automatically gathers browser, extension version and OS.
 
 ### v4.4.0
@@ -274,23 +110,23 @@ and OS are automatically included in email/reddit template.
 * Started using mutation observers to watch for anything modifying the size of our video.
 * **[4.2.3.1]** fixed some bugs in popup.
 
-### v4.2.2
+### v4.2.2 
 
 * Fixed player detection on reddit (for videos from v.reddit)
 
 ### v4.2.1
 * Fixed bug where custom CSS didn't get applied to pages
 
-### v4.2.0
+### v4.2.0 
 
 * Slightly improved popup design. (Design change suggested by PortaTrekos)
-* Player detection: youtube and twitch now have manual player element detection, with strictly defined players.
+* Player detection: youtube and twitch now have manual player element detection, with strictly defined players. 
 * Improved site settings control in extension popup. It's possible to enable extension for previously disabled embedded sites.
 * Improved incompatibilities with reddit, where videos would be vertically misaligned when not using RES
 * Fixed imcompatibilities with Iridium. Flicker when clicking play/pause or switching between big and popup player is caused by either Youtube or Iridium trying to apply their styles over mine.
 * Issues with inconsistent alignment that some people reported are potentially fixed
 
-### v4.1.2
+### v4.1.2 
 
 * Fixed video alignment issues on www.reddit as well (for people who use old reddit without going to old.reddit)
 * Fixed bug with 'player detection' tab
@@ -302,17 +138,17 @@ and OS are automatically included in email/reddit template.
 ### v4.1.0
 
 * Added ability to add custom CSS to page
-* Fixed video alignment issues on old.reddit. Disabled extension on imgur by default.
+* Fixed video alignment issues on old.reddit. Disabled extension on imgur by default. 
 * Extension now works on vimeo again
 * **UX:** Renamed 'about' to 'report a problem' in order to make contact info more discoverable
 
 
 ### v4.0.1
 
-* Fixed bug where sites using 'default' option in 'Extension mode' settings would be disabled, even if extension was not.
+* Fixed bug where sites using 'default' option in 'Extension mode' settings would be disabled, even if extension was not. 
 * Fixed bug where extension sometimes wouldn't work on Netflix.
 
-### v4.0.0
+### v4.0.0 
 
 * Fixed the bug where saving settings wouldn't work
 * Massive under-the-hood changes. The extension popup and settings page use VueJS
@@ -342,7 +178,7 @@ and OS are automatically included in email/reddit template.
 
 Never happened, got bumped to 4.0.0.
 
-### v3.2.2
+### v3.2.2 
 
 * Pan event listener now gets properly unbound
 * Fixed 'reset zoom' button in popup
@@ -351,7 +187,7 @@ Never happened, got bumped to 4.0.0.
 
 * Fixed issue where global video alignment setting didn't get saved properly
 
-### v3.2.0
+### v3.2.0 
 
 * Zoom and panning
 * Reorganized popup
@@ -391,7 +227,7 @@ User-facing changes:
 
 Added some anti-lag measures. This seems to be an issue affecting _only_ Chrome (and only then some installs), where canvas.drawImage() won't work properly for some reason.
 
-### v2.2.4
+### v2.2.4 
 
 Lots of mostly incredibly minor stuff.
 
@@ -402,11 +238,11 @@ Lots of mostly incredibly minor stuff.
 * Fixed some under-the-hood bugs nobody knew they even existed
 * A lil bit of refactoring
 
-### v2.2.3
+### v2.2.3 
 
 * Fixed automatic aspect ratio detection on DRM-protected sites.
 
-### v2.2.2
+### v2.2.2  
 
 * Fixes problems with switching from normal to fullscreen player on youtube. If 2.2.1 didn't fix the font issue, this version should have.
 
@@ -422,9 +258,9 @@ Various improvements to automatic aspect ratio detection:
 * **Fixed the situation with insane memory usage due to the automatic aspect ratio detection (#25, #32) and lag that appeared in certain cases after the extension has been running for a while.** There's still fun stuff going on — see notes below.
 * Improved accuracy of automatic detection. This should fix the issue of rapid switching in dark videos or videos with otherwise uneven edges (#12 - [video](https://www.youtube.com/watch?v=NaTGwlfRB_c); #24 - [video](https://www.youtube.com/watch?v=xvZqHgFz51I) (see the car at the beginning))
 
-Improved accuracy has increased the base RAM usage, and not by a small amount (I seem to have fixed my blunders, so that could _actually_ be on Firefox). As a result, I've reduced both resolution of the sample as well as polling frequency.
+Improved accuracy has increased the base RAM usage, and not by a small amount (I seem to have fixed my blunders, so that could _actually_ be on Firefox). As a result, I've reduced both resolution of the sample as well as polling frequency. 
 
-Polling of 1 check per second shouldn't use too much RAM. If you want automatic aspect ratio detection to react faster, you can up that number to 30 in the settings. 30 checks per second can be expensive: up to 400 MB if you've just started Firefox and went to youtube. Can go north of 2 gigs if you've been running Firefox for longer than that (seems to be a problem with Javascript garbage collection).
+Polling of 1 check per second shouldn't use too much RAM. If you want automatic aspect ratio detection to react faster, you can up that number to 30 in the settings. 30 checks per second can be expensive: up to 400 MB if you've just started Firefox and went to youtube. Can go north of 2 gigs if you've been running Firefox for longer than that (seems to be a problem with Javascript garbage collection). 
 
 Videos that aren't playing (e.g. videos that are paused or ended) do (should) ***not*** use any meaningful amount of RAM.
 
@@ -442,11 +278,11 @@ Videos that aren't playing (e.g. videos that are paused or ended) do (should) **
 
 Youtube fix seems to have broken Chrome compatibility (again), so any quick fix for this point forward will land in Chrome version along with v2.2.
 
-### v2.1.2
+### v2.1.2 
 
 * Fixed some bugs with autodetection sometimes not working properly on Youtube.
 
-Problem: there's this bit of code that keeps aspect ratio from changing when the difference between 'previous' and 'current' aspect ratio is too small. Unfortunately, the 'previous' value was _not_ updated on every aspect ratio switch for some reason. Also `ArDetect.init()` — for some reason — didn't always clean the 'previous' value even though it should.
+Problem: there's this bit of code that keeps aspect ratio from changing when the difference between 'previous' and 'current' aspect ratio is too small. Unfortunately, the 'previous' value was _not_ updated on every aspect ratio switch for some reason. Also `ArDetect.init()` — for some reason — didn't always clean the 'previous' value even though it should. 
 
 ### v2.1.1
 
@@ -458,7 +294,7 @@ Problem: there's this bit of code that keeps aspect ratio from changing when the
 * Popup should work more reliably now
 * Twitch works ... kinda but not always
 
-### v2.0.3
+### v2.0.3 
 
 * Fixed the bug where Netflix videos weren't vertically centered in Firefox 57+ (not present in Chrome or FF 56 or earlier)
 
@@ -519,15 +355,15 @@ The extension is being rewritten almost ground-up, around automatic aspect ratio
 
 * Introduced Netflix support.
 
-As Netflix relies on extension re-initializing at least the UI ***a lot***, the optimization introduced in 1.0.2 was reversed (as waiting 2 seconds for the UI to appear is just too much).
+As Netflix relies on extension re-initializing at least the UI ***a lot***, the optimization introduced in 1.0.2 was reversed (as waiting 2 seconds for the UI to appear is just too much). 
 
 Furthermore, triggering UI re-initialisation on onUpdated events turned out to not be the proper way to go: immediately after the extension is initialized, onUpdated gets triggered even more often than your average Buzzfeed writer/reader. But change the episode on Netflix and suddenly, onUpdated gets barely triggered at all — which means that more often than not, the UI extension injects into the page wasn't visible. (the fuck, really)
 
 This is why Netflix uses another function that manually checks whether the player bar is present. Ideally that check happens every tenth of a second, but Firefox may be limiting that to one per second.
 
-### v1.0.2
+### v1.0.2  
 
-The 'extension sometimes not working' bug was fixed (by having extension try to setup every time a page got updated), but the fix had some problems. Namely, the extension would re-initiate (complete with re-adding the entire UI) itself very _very_ often.
+The 'extension sometimes not working' bug was fixed (by having extension try to setup every time a page got updated), but the fix had some problems. Namely, the extension would re-initiate (complete with re-adding the entire UI) itself very _very_ often. 
 
 This could be a problem, so it was fixed. Extension is notified of updates only every ~2 seconds (which absorbs most of the "page was updated" events on page load) and doesn't attempt to reload the UI if the UI was already loaded. (Unless `debugmsg` is set to true. It's generally not, but any commits to this repo could potentially still have it enabled).
 
@@ -541,7 +377,7 @@ Fixed the bug where sometimes the extension would fail to work. (example: you op
 
 ### v1.0-rc1
 
-* Settings page is added and mostly working.
+* Settings page is added and mostly working. 
 
 ### v0.9.9.6
 
@@ -557,7 +393,7 @@ Fixed the bug where sometimes the extension would fail to work. (example: you op
 
 ### v0.9.9.1
 
-* Keybinds `a` and `w` now work.
+* Keybinds `a` and `w` now work. 
 * Some changes under the bonnet, mostly regarding the way keypresses are handled.
 * 'Settings' page is ~15% done.
 

DOCUMENTATION.MD

@@ -1,6 +0,0 @@
-# Implementation details
-
-## Enabling/disabling aspect ratio corrections
-
-* Aspect ratios are changed by proxy. Extension attaches **a custom CSS class** to `video` and `player` elements.
-* To prevent extension from affecting the appearance of a webpage, **it's sufficient to remove our custom CSS classes from `video` and `player` elements.** 

Jenkinsfile

@@ -1,32 +0,0 @@
-// required jenkins plugins:
-//     * https://plugins.jenkins.io/git/
-
-pipeline {
-  agent any
-
-  stages {
-
-    // stage('Check for changes') {
-    //   sh "env.GIT_COMMIT != env.GIT_PREVIOUS_COMMIT"
-    // }
-
-    stage('Install dependencies') {
-      steps {
-        sh 'npm ci'
-      }
-    }
-
-    stage('Build') {
-      steps {
-        sh 'npm run build-all'
-      }
-    }
-
-    stage('Push to release server') {
-      steps {
-        sh "echo 'implement me pls!'"
-      }
-    }
-  }
-
-}

README-AMO.md

@@ -4,28 +4,14 @@
 
 The extension is built on a PC running Manjaro Linux. npm and node are installed from repositories/aur.
 
-### Software versions:
 
-Node/npm versions:
+## Installing dependencies
 
-```
+Run `npm ci`
-node: %%NODE_VERSION%%
-npm:  %%NPM_VERSION%%
-```
 
-Linux (`uname -a`):
-
-```
-%%LINUX_VERSION%%
-```
 
 ## Reproducing build
 
-Run the following commands to install dependencies and compile the firefox build:
+`npm run build`
 
-```
+The compiled code pops up in /dist-ff (/dist-chrome for Chromium-based browsers).
-npm ci
-npm run build
-```
-
-The compiled code pops up in `/dist-ff`.

README.md

@@ -1,8 +1,8 @@
-# Ultrawidify — aspect ratio fixer for youtube and netflix
+# Ultrawidify — aspect ratio fixer for youtube and netflix
 
 ## Super TL;DR: I'm just looking for the install links, thanks
 
-[Firefox](https://addons.mozilla.org/en/firefox/addon/ultrawidify/), [Chrome](https://chrome.google.com/webstore/detail/ultrawidify/dndehlekllfkaijdlokmmicgnlanfjbi), [Edge](https://microsoftedge.microsoft.com/addons/detail/ultrawidify/lmpgpgechmkkkehkihpiddbcbgibokbi). 
+[Firefox](https://addons.mozilla.org/en/firefox/addon/ultrawidify/), [Chrome](https://chrome.google.com/webstore/detail/ultrawidify/dndehlekllfkaijdlokmmicgnlanfjbi), [Edge](https://github.com/tamius-han/ultrawidify#microsoft-edge) (Chromium-based only)
 
 There's also [nightly "builds"](https://stuff.lionsarch.tamius.net/ultrawidify/nightly/).
 
@@ -13,9 +13,10 @@ If you own an ultrawide monitor, you have probably noticed that sometimes videos
 ![Demo](img-demo/example-httyd2.png "Should these black bars be here? No [...] But an ultrawide user never forgets.")
 
 
+
 ## Known issues
 
-* Netflix autodetection not working in Chrome and working poorly in Firefox. This problem happens because DRM, and happens on other sites utilizing DRM protection schemes. Don't expect Chrome support any time soon.
+* Netflix autodetection not working in Chrome, wontfix as issue is fundamentally unfixable.
 * Everything reported in [issues](https://github.com/tamius-han/ultrawidify/issues)
 
 ### Limitations
@@ -24,14 +25,15 @@ If you own an ultrawide monitor, you have probably noticed that sometimes videos
 * Autodetection is only correct 95% of the time, most of the time.
 * That new stretching mode wasn't thoroughly tested yet. Issues may be present. (Same with zoom)
 * Enabling extension everywhere (as opposed to whitelisted sites) could break some websites.
+* Edge has 
 
 ### Features
 
 * **Can be enabled or disabled on per-site basis**
-* **Crop video to fit screen** (no stretching. Supported aspect ratios: 21/9 (1:2.39), 16:9, 16:10. It's possible to set additional aspect ratios, but settings GUI currently contains some mildly annoying bugs)
+* **Crop video to fit screen** (no stretching. Supported aspect ratios: 21/9 (1:2.39), 16:9, 16:10, _one (1) custom aspect ratio_)
-* **Automatic aspect ratio detection** (can be enabled/disabled entirely or on a per-site basis, separately of the extension. May not work on sites utilizing DRM schemes, such as Netflix et. al.). Autodetection in action: [youtube](https://www.youtube.com/watch?v=j2xn1WpbtCQ))
+* **Automatic aspect ratio detection** (can be enabled/disabled entirely or on a per-site basis, separately of the extension. Autodetection in action: [youtube](https://www.youtube.com/watch?v=j2xn1WpbtCQ))
 * **Supports Youtube theater mode**
-* **[EXPERIMENTAL!]** Stretch video to fit the screen
+* **[EXPERIMENTAL!]** Stretch video to fit the screen (4 different approaches)
 * **[EXPERIMENTAL!]** custom zooming and panning
 
 
@@ -39,23 +41,19 @@ If you own an ultrawide monitor, you have probably noticed that sometimes videos
 
 * Youtube
 * Netflix
-* Twitch
 
 ### Other sites
 
 I am not actively testing extension on other sites. You can try your luck and enable extension for any unsupported site you stumble across via extension popup, but I make no guarantees it will work everywhere.
 
-If extension doesn't work for a site I'm not testing on out of the box, follow [this wiki](https://github.com/tamius-han/ultrawidify/wiki/Fixing-site-incompatibilites-('Advanced-settings')). The 'quick and dirty' approach should work for most sites. (If you try doing things the proper way, you should really know what you're doing.)
-
 ### Installing this extension
 
-You can download this extension from the relevant extension stores:
+You can download this extension from Firefox' and Chrome's extension stores:
 
 * [Firefox](https://addons.mozilla.org/en/firefox/addon/ultrawidify/)
-* [Chrome](https://chrome.google.com/webstore/detail/ultrawidify/dndehlekllfkaijdlokmmicgnlanfjbi)
+* [Chrome, Opera, Chromium Edge](https://chrome.google.com/webstore/detail/ultrawidify/dndehlekllfkaijdlokmmicgnlanfjbi)
-* [Edge](https://microsoftedge.microsoft.com/addons/detail/ultrawidify/lmpgpgechmkkkehkihpiddbcbgibokbi)
 
-Other browsers are not officially supported. If you're using a different Chromium-based browser, you can try installing the addon from the Chrome Web Store — but if things don't work, you're on your own.
+Opera users and users of the new, Chromium-based Edge can install Ultrawidify from Chrome Web Store as well.
 
 ### Nightly builds
 
@@ -82,7 +80,7 @@ You can make a donation [via Paypal](https://www.paypal.me/tamius).
 
 # The long version
 
-The technology has been here for a while, but plenty of people don't know how to properly encode a video (despite the fact [youtube has an article that explains aspect ratios](https://support.google.com/youtube/answer/6375112)). Plenty of people surprisingly includes major Hollywood studios, such as [Marvel](https://www.youtube.com/watch?v=Ke1Y3P9D0Bc), [Disney](https://www.youtube.com/watch?v=yCOPJi0Urq4), [Dreamworks](https://www.youtube.com/watch?v=oKiYuIsPxYk), [Warner Brothers](https://www.youtube.com/watch?v=VYZ3U1inHA4), [Sony](https://www.youtube.com/watch?v=7BWWWQzTpNU), et cetera. You'd think that this is the one thing Hollywood studios and people who make [music videos for a living](https://www.youtube.com/watch?v=c6Mx2mxpaCY) would know how to do right, but they don't. This extension is here to fix that.
+The technology has been here for a while, but plenty of people don't know how to properly encode a video (despite the fact [youtube has an article that explains aspect ratios](https://support.google.com/youtube/answer/6375112)). Plenty of people surprisingly includes major Holywood studios, such as [Marvel](https://www.youtube.com/watch?v=Ke1Y3P9D0Bc), [Disney](https://www.youtube.com/watch?v=yCOPJi0Urq4), [Dreamworks](https://www.youtube.com/watch?v=oKiYuIsPxYk), [Warner Brothers](https://www.youtube.com/watch?v=VYZ3U1inHA4), [Sony](https://www.youtube.com/watch?v=7BWWWQzTpNU), et cetera. You'd think that this is the one thing Holywood studios and people who make [music videos for a living](https://www.youtube.com/watch?v=c6Mx2mxpaCY) would know how to do right, but they don't. This extension is here to fix that.
 
 ![Jesus Christ.](img-demo/example-jasonbourne.png "This is indeed worse than Snowden.")
 
@@ -235,6 +233,7 @@ However, I do plan on implementing this feature. Hopefully by the end of the yea
 
 
 
+
 ## Plans for the future
 
 1. Handle porting of extension settings between versions. 
@@ -253,9 +252,6 @@ However, I do plan on implementing this feature. Hopefully by the end of the yea
 
 [Latest stable for Chrome — download from Chrome store](https://chrome.google.com/webstore/detail/ultrawidify/dndehlekllfkaijdlokmmicgnlanfjbi)
 
-Edge version is currently not available, as Edge has some bugs that prevent this extension from working correctly. [Read more](https://github.com/tamius-han/ultrawidify/issues/117#issuecomment-747109695)
-<!-- [Latest stable for Edge — Download from Microsoft store](https://microsoftedge.microsoft.com/addons/detail/lmpgpgechmkkkehkihpiddbcbgibokbi) -->
-
 ### Installing the current, github version
 
 ## Get pre-built version:
@@ -268,7 +264,7 @@ Requirements: npm, node.
 
 1. Clone this repo
 2. run `npm install`
-3. If using **Firefox,** run: `npm run watch:dev`. If using **Chrome,** run: `npm run watch-chrome:dev`.
+3. If using **Firefox,** run: `npm run watch:dev`. If using **Chrome,** run: `npm run watch-chrome:dev`. If using Edge, run: `npm run watch-edge:dev`.
 
 TODO: see if #3 already loads the extension in FF
 
@@ -277,6 +273,26 @@ TODO: see if #3 already loads the extension in FF
 4. Add temporary addon
 5. Select `${ultrawidify_folder}/dist/manifest.json`
 
+
+# Microsoft Edge
+
+With the advent of the new Chromium-based Edge, this extension should work just fine. I don't actively test in Edge, though, so your mileage may vary.
+
+## Chromium-based
+
+1. Visit [edge://extensions](edge://extensions/)
+2. Go to [Chrome Web Store](https://chrome.google.com/webstore/detail/ultrawidify/dndehlekllfkaijdlokmmicgnlanfjbi)
+3. Click 'Allow extensions from other stores' on the blue popup bar at the top of the screen
+4. Install Ultrawidify
+5. Enjoy
+
+I might reconsider publishing extension for Chromium-based Microsoft Edge once it's released. Releasing in MS Store appears to be impossible at current time as extension submissions don't appear to be open at all (unless you got a special invite or something).
+
+## Old Edge
+
+1. Get [Chromium-based Edge](https://www.microsoftedgeinsider.com/en-us/)
+2. See steps above
+
 # Changelog
 
 see changelog.md

package.json

@@ -1,78 +1,54 @@
 {
   "name": "ultrawidify",
-  "version": "6.0.2",
+  "version": "4.4.8",
   "description": "Aspect ratio fixer for youtube and other sites, with automatic aspect ratio detection. Supports ultrawide and other ratios.",
   "author": "Tamius Han <tamius.han@gmail.com>",
   "scripts": {
-    "build": "npm run pre-build; cross-env NODE_ENV=production BROWSER=firefox CHANNEL=stable webpack --hide-modules",
-    "build-all": "bash ./scripts/build-all.sh",
-    "build-chrome": "cross-env NODE_ENV=production BROWSER=chrome CHANNEL=stable webpack --hide-modules",
-    "build-chrome:dev": "cross-env NODE_ENV=development BROWSER=chrome webpack --hide-modules",
-    "build-edge": "cross-env NODE_ENV=production BROWSER=edge CHANNEL=stable webpack --hide-modules",
-    "build-nightly": "cross-env NODE_ENV=development BROWSER=firefox CHANNEL=nightly webpack --hide-modules",
-    "build-nightly-chrome": "cross-env NODE_ENV=development BROWSER=chrome CHANNEL=nightly webpack --hide-modules",
-    "build-testing": "cross-env NODE_ENV=development BROWSER=firefox CHANNEL=testing webpack --hide-modules",
-    "build-testing-chrome": "cross-env NODE_ENV=development BROWSER=chrome CHANNEL=testing webpack --hide-modules",
-    "build-zip": "node scripts/build-zip.js",
-    "build:dev": "webpack --hide-modules",
-    "dev": "cross-env NODE_ENV=development CHANNEL=dev concurrently \"cross-env BROWSER=firefox npm run build:dev -- --watch\" \"cross-env BROWSER=chrome npm run build:dev -- --watch\"  \"cross-env BROWSER=edge npm run build:dev -- --watch\"",
-    "dev:windows": "cross-env NODE_ENV=development CHANNEL=dev concurrently \"cross-env BROWSER=firefox npm run build:dev -- -w --watch-poll\" \"cross-env BROWSER=chrome npm run build:dev -- -w --watch-poll\"  \"cross-env BROWSER=edge npm run build:dev -- -w --watch-poll\"",
-    "dev-ff": "rm -rf ./dist-ff && cross-env NODE_ENV=development CHANNEL=dev BROWSER=firefox npm run build:dev -- --watch",
-    "dev-chrome": "rm -rf ./dist-chrome && cross-env NODE_ENV=development CHANNEL=dev BROWSER=chrome npm run build:dev -- --watch",
-    "dev-edge": "rm -rf ./dist-edge && cross-env NODE_ENV=development CHANNEL=dev BROWSER=edge npm run build:dev -- --watch",
-    "pre-build": "rm -rf ./dist-ff; rm -rf ./dist-chrome; rm -rf ./dist-edge; rm -rf ./node_modules; npm ci",
     "start": "npm run dev",
-    "start:windows": "npm run dev:windows"
+    "build": "cross-env NODE_ENV=production BROWSER=firefox CHANNEL=stable webpack --hide-modules",
+    "build-chrome": "cross-env NODE_ENV=production BROWSER=chrome CHANNEL=stable webpack --hide-modules",
+    "build-edge": "cross-env NODE_ENV=production BROWSER=edge CHANNEL=stable webpack --hide-modules",
+    "build:dev": "webpack --hide-modules",
+    "build-testing": "cross-env NODE_ENV=development BROWSER=firefox CHANNEL=testing webpack --hide-modules",
+    "build-nightly": "cross-env NODE_ENV=development BROWSER=firefox CHANNEL=nightly webpack --hide-modules",
+    "build-testing-chrome": "cross-env NODE_ENV=development BROWSER=chrome CHANNEL=testing webpack --hide-modules",
+    "build-nightly-chrome": "cross-env NODE_ENV=development BROWSER=chrome CHANNEL=nightly webpack --hide-modules",
+    "build-chrome:dev": "cross-env NODE_ENV=development BROWSER=chrome webpack --hide-modules",
+    "build-all": "mkdir -p ./build/old; rm -rf ./dist-ff; rm -rf ./dist-chrome; rm ./dist-zip/uw-amo-source.zip; mv -f ./dist-zip/*.zip ./build/old; npm run build; node scripts/build-zip.js ff; npm run build-chrome; node scripts/build-zip.js chrome; ./scripts/prepare-amo-source.sh",
+    "build-zip": "node scripts/build-zip.js",
+    "dev": "cross-env NODE_ENV=development CHANNEL=dev concurrently \"cross-env BROWSER=firefox npm run build:dev -- --watch\" \"cross-env BROWSER=chrome npm run build:dev -- --watch\""
   },
   "dependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.16.0",
+    "@types/core-js": "^2.5.0",
-    "@mdi/font": "^6.5.95",
+    "@types/es6-promise": "^3.3.0",
-    "@mdi/js": "^6.4.95",
+    "concurrently": "^5.1.0",
-    "@types/resize-observer-browser": "^0.1.6",
-    "concurrently": "^5.3.0",
     "fs-extra": "^7.0.1",
-    "gl-matrix": "^3.4.3",
     "json-cyclic": "0.0.3",
-    "lodash": "^4.17.21",
+    "vue": "^2.6.11",
-    "mdi-vue": "^3.0.11",
+    "vuex": "^3.1.2",
-    "typescript": "^4.4.4",
+    "vuex-webextensions": "^1.3.0",
-    "vue": "^3.2.21",
+    "webextension-polyfill": "^0.6.0"
-    "vue-style-loader": "^4.1.3",
-    "vuex": "^4.0.2",
-    "vuex-webextensions": "^1.3.3",
-    "webextension-polyfill": "^0.12.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
+    "@babel/core": "^7.8.3",
-    "@babel/preset-env": "^7.16.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-    "@types/chrome": "0.0.240",
+    "@babel/preset-env": "^7.8.3",
-    "@types/core-js": "^2.5.5",
-    "@types/es6-promise": "^3.3.0",
-    "@types/firefox": "0.0.31",
-    "@types/lodash": "^4.14.176",
-    "@types/node": "^14.17.32",
-    "@vue/cli": "^4.5.15",
-    "@vue/cli-plugin-typescript": "^4.5.15",
-    "@vue/compiler-sfc": "^3.2.21",
     "archiver": "^3.0.0",
-    "babel-loader": "^8.2.3",
+    "babel-loader": "^8.0.6",
-    "babel-preset-es2020": "^1.0.2",
     "copy-webpack-plugin": "^4.5.3",
     "cross-env": "^5.2.0",
     "css-loader": "^0.28.11",
     "ejs": "^2.7.4",
     "file-loader": "^1.1.11",
     "mini-css-extract-plugin": "^0.4.4",
-    "node-sass": "^4.14.1",
+    "node-sass": "^4.13.1",
-    "resolve-url-loader": "^5.0.0",
     "sass-loader": "^7.1.0",
-    "ts-loader": "^8.3.0",
+    "vue-loader": "^15.8.3",
-    "vue-cli-plugin-vue-next": "~0.1.4",
+    "vue-template-compiler": "^2.6.11",
-    "vue-loader": "^16.8.2",
+    "web-ext-types": "^2.1.0",
-    "web-ext-types": "^2.3.0",
+    "webpack": "^4.41.5",
-    "webpack": "^4.46.0",
     "webpack-chrome-extension-reloader": "^0.8.3",
-    "webpack-cli": "^3.3.12",
+    "webpack-cli": "^3.3.10",
     "webpack-shell-plugin": "^0.5.0"
   }
 }

scripts/build-all.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# NOTE: this script needs to be run with the npm run build-all
-# command from the root directory of the project. Running it in
-# any other way probably isn't going to work.
-
-# pre-build steps:
-mkdir -p ./build/old
-npm run pre-build
-rm ./dist-zip/uw-amo-source.zip
-mv -f ./dist-zip/*.zip ./build/old
-
-# lets force raise ram limit, but the improper way
-# export NODE_OPTIONS=--max_old_space_size=4096
-
-# build the version for each browser and create a zip afterwards
-# step 1: define build functions
-#function buildFF {
-  npm run build
-  node scripts/build-zip.js ff
-#}
-#function buildChrome {
-  npm run build-chrome
-  node scripts/build-zip.js chrome
-#}
-#function buildEdge {
-  npm run build-edge
-  node scripts/build-zip.js edge
-#}
-
-# step 2: execute them all at once
-# buildFF &
-# buildChrome &
-# buildEdge &
-
-# wait < <(jobs -p)
-
-# prepare AMO source
-# source code needs to be prepared AFTER
-# the code has been built, to ensure that
-# package-lock.json remains unchanged
-./scripts/prepare-amo-source.sh

scripts/build-and-deploy.sh

@@ -37,9 +37,6 @@ if [ ! -z "$GIT_COMMIT" ] ; then
   fi
 fi
 
-# let's raise RAM limit for npm command globally
-NODE_OPTIONS=--max_old_space_size=4096
-
 npm ci
 
 rm -rf ./dist-zip || true   # no big deal if ./dist-zip doesn't exist
@@ -49,7 +46,7 @@ mkdir dist-zip              # create it back
 # build firefox
 #
 npm run "${BUILD_SCRIPT}"
-node --max-old-space-size=2048 scripts/build-zip.js ff nightly
+node scripts/build-zip.js ff nightly
 # if [ ! -z "${AMO_API_KEY}" ] ; then
 #   if [ ! -z "${AMO_API_SECRET}" ] ; then 
 #     web-ext sign --source-dir ./dist --api-key "${AMO_API_KEY}" --api-secret "${AMO_API_SECRET}"
@@ -60,18 +57,12 @@ node --max-old-space-size=2048 scripts/build-zip.js ff nightly
 # build chrome
 #
 npm run "${BUILD_SCRIPT}-chrome"
-node --max-old-space-size=2048 scripts/build-zip.js chrome nightly
+node scripts/build-zip.js chrome nightly
+
 #
 #./scripts/build-crx.sh
 #
 
-#
-# build edge
-#
-npm run "${BUILD_SCRIPT}-edge"
-node --max-old-space-size=2048 scripts/build-zip.js chrome nightly
-
-
 ######################################
 #        UPLOAD TO WEB SERVER 
 ######################################
@@ -85,6 +76,7 @@ echo "Uploading to server ..."
 scp -i ~/.ssh/id_rsa -r ./dist-zip/* "ultrawidify-uploader@${RELEASE_SERVER}:${RELEASE_DIRECTORY}${BUILD_CHANNEL_DIRECTORY}"
 
 
+
 ######################################
 #       Build finished message
 ######################################

scripts/build-crx.sh

@@ -5,7 +5,7 @@
 #
 # Script assumes we're in basedir of the repository and that extension has been built and zipped to /dist-zip
 # using the crx name we want (same name as zip, except different extension)
-#
+# 
 # also this doesn't check for errors ever so
 #
 
@@ -42,4 +42,4 @@ sig_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$sig" | awk '{print $5}')))
 echo "Wrote $crx"
 
 echo "exiting dist-zip"
-cd ..
+cd ..

scripts/build-zip.js

@@ -24,7 +24,7 @@ const buildZip = (src, dist, zipFilename) => {
 
   const archive = archiver('zip', { zlib: { level: 9 }});
   const stream = fs.createWriteStream(path.join(dist, zipFilename));
-
+  
   return new Promise((resolve, reject) => {
     archive
       .directory(src, false)
@@ -46,14 +46,14 @@ const main = () => {
     browserPostfix = browser;
   }
   const destDir = path.join(__dirname, `../dist-${browserPostfix}`);
-  const zipDir = path.join(__dirname, '../dist-zip');
+  const zipDir = path.join(__dirname, '../dist-zip'); 
   const {name, version} = extractExtensionData(browserPostfix);
 
   // collapse spaces and dashes into single dash
   const baseFilename = `${name.replace(/[ -]+/g, '-')}-${version}`;
 
   let realZipDir;
-
+  
   if (!!testingOrNightly) {
     realZipDir = path.join(zipDir, version);
   } else {
@@ -61,7 +61,7 @@ const main = () => {
   }
 
   const zipFilename = `${baseFilename}-${browser}.zip`;
-
+  
   try {
     makeDirIfNotExists(realZipDir, {recursive: true});
   } catch (e) {
@@ -70,7 +70,7 @@ const main = () => {
   }
   buildZip(destDir, realZipDir, zipFilename)
     .then(() => console.info('OK'))
-    .catch(console.err);
+    .catch(console.err); 
 };
 
 main();

scripts/prepare-amo-source.sh

@@ -2,46 +2,4 @@
 
 # makes a zip file with human-readable source code that we need to upload to AMO
 # since webpack minifies stuff
-
+zip -r dist-zip/uw-amo-source.zip README-AMO.md .babelrc package.json package-lock.json webpack.config.js src/
-# first, we collect npm/node versions: 
-# (NOTE: the last bit is necessary to remove ANSI color codes from output)
-NODE_VERSION=`node --version`
-NPM_VERSION=`npm --version`
-LINUX_VERSION="$(uname -a | sed 's/\//\\\//g')"
-
-# copy REAMDE to /tmp for processing
-cp README-AMO.md /tmp/README-AMO.md
-
-# replace placeholders with proper software versions
-sed -i "s/%%NODE_VERSION%%/${NODE_VERSION}/g" /tmp/README-AMO.md
-sed -i "s/%%NPM_VERSION%%/${NPM_VERSION}/g" /tmp/README-AMO.md
-sed -i "s/%%LINUX_VERSION%%/${LINUX_VERSION}/g" /tmp/README-AMO.md
-
-# add files to archive
-zip -r dist-zip/uw-amo-source.zip /tmp/README-AMO.md .babelrc package.json package-lock.json webpack.config.js scripts/ src/
-
-# rename /tmp/README-AMO.md to README.md
-printf "@ tmp/README-AMO.md\n@=README.md\n" | zipnote -w dist-zip/uw-amo-source.zip
-
-# printout for debugging purposes:
-echo ""
-echo "—————— AMO SOURCE PREPARATION FINISHED ——————"
-echo "                 Debug info:"
-echo ""
-echo "node --version:"
-node --version
-echo ""
-echo "npm --version"
-npm --version
-echo ""
-echo "uname -a"
-uname -a
-echo ""
-echo ""
-echo "extracted variables:"
-echo "NODE_VERSION: ${NODE_VERSION}"
-echo "NPM_VERSION:  ${NPM_VERSION}"
-echo "UNAME:        ${LINUX_VERSION}"
-echo ""
-echo ""
-echo "—————— EXTENSION PACKAGES READY FOR UPLOAD ——————"

scripts/remove-evals.js

@@ -5,7 +5,8 @@ const fs = require('fs');
 
 const BUNDLE_DIR = path.join(__dirname, `../dist-${process.env.BROWSER === 'firefox' ? 'ff' : process.env.BROWSER}`);
 const bundles = [
-  'csui/csui-popup.js',
+  'popup/popup.js',
+  'options/options.js',
 ];
 
 const evalRegexForProduction = /;([a-z])=function\(\){return this}\(\);try{\1=\1\|\|Function\("return this"\)\(\)\|\|\(0,eval\)\("this"\)}catch\(t\){"object"==typeof window&&\(\1=window\)}/g;

scripts/reproducability-test.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-
-### VARIABLES
-
-REPRODUCABILITY=5         # how many times we need to build with same hash
-
-### TEST STARTS HERE ###
-
-CURRENT_DIR=$(pwd)
-
-if [[ $(echo $0 | awk -F"/" '{print NF-1}') -eq 1 ]] ; then
-  # we need to go one directory up
-  cd ..
-fi
-
-# cleanup after self if we already ran and previous test crashed or 
-# something before it cleaned up after itself.
-rm -rf /tmp/uw-test-runs/* 2>/dev/null # we not interested if fails
-
-# make new folder if it doesn't exist
-mkdir -p /tmp/uw-test-runs 
-
-for ((run=0;run<$REPRODUCABILITY;run++)) ; do
-  echo ""
-  echo "---- run ${run} ----"
-  
-  # save hash and then run build. Save hash.
-  OLD_HASH=$HASH
-  HASH=$(npm run build 2>/dev/null | grep "Hash:")
-  
-  # move build file to /tmp, where it'll be saved for later
-  mv dist-ff /tmp/uw-test-runs/${run}
-  
-  # skip comparisons with previous tests on first run,
-  # cos we don't have anything to compare against yet
-  if [[ $run -ne 0 ]] ; then
-    if [[ "$OLD_HASH" == "$HASH" ]] ; then
-      echo "Hashes ok${HASH##*:}"
-    else 
-      echo "Webpack hashes do not match! (${OLD_HASH##*:} <---> ${HASH##*:})"
-    fi
-    
-    echo "Diff test (no output=ok):"
-    diff -qr /tmp/uw-test-runs/${prev_run} /tmp/uw-test-runs/${run}
-  else
-    echo "Webpack hash: $HASH"
-  fi
-  
-  # save id of previous run
-  prev_run=$run
-done
-
-# clean up after self
-rm -rf /tmp/uw-test-runs
-
-# restore dir
-cd "$CURRENT_DIR"

src/common/components/ActionAlt.vue

@@ -5,16 +5,16 @@
 
       </div>
       <div class="flex action-name">
-        <span v-if="action.cmd && action.cmd.length > 1 || action.cmd[0].action === 'set-ar' && action.userAdded || (action.cmd[0].arg === AspectRatioType.Fixed)" class="icon red" @click="removeAction()">🗙</span>
+        <span v-if="action.cmd && action.cmd.length > 1 || action.cmd[0].action === 'set-ar' && action.userAdded || (action.cmd[0].arg === AspectRatio.Fixed)" class="icon red" @click="removeAction()">🗙</span>
         <span v-else class="icon transparent">🗙</span> &nbsp; &nbsp;
         <span class="icon" @click="editAction()">🖉</span> &nbsp; &nbsp;
         {{action.name}}
       </div>
     </div>
     <div class="command-details">
-      <div class="flex flex-col cmd-container cd-pad">
+      <div class="flex flex-column cmd-container cd-pad">
         <div class="flex bold">
-          Command:
+          Command: 
         </div>
         <div class="flex cmdlist">
           {{parseCommand(action.cmd)}}
@@ -22,7 +22,7 @@
       </div>
 
      <!-- SCOPES -->
-      <div class="flex flex-col scopes-container cd-pad">
+      <div class="flex flex-column scopes-container cd-pad">
         <div class="flex bold">Popup tabs:</div>
 
         <!-- global scope -->
@@ -108,16 +108,16 @@
 </template>
 
 <script>
-import StretchType from '../enums/StretchType.enum';
+import Stretch from '../enums/stretch.enum';
-import AspectRatioType from '../enums/AspectRatioType.enum';
+import AspectRatio from '../enums/aspect-ratio.enum';
 import KeyboardShortcutParser from '../js/KeyboardShortcutParser';
 
 
 export default {
   data () {
     return {
-      StretchType: StretchType,
+      Stretch: Stretch,
-      AspectRatioType: AspectRatioType,
+      AspectRatio: AspectRatio,
     }
   },
   created () {
@@ -244,4 +244,5 @@ export default {
 .transparent {
   opacity: 0;
 }
+
 </style>

src/common/components/ActionRow.vue

@@ -46,13 +46,13 @@
 </template>
 
 <script>
-import StretchType from '../enums/StretchType.enum';
+import Stretch from '../enums/stretch.enum';
 import KeyboardShortcutParser from '../js/KeyboardShortcutParser'
 
 export default {
   data () {
     return {
-      StretchType: StretchType
+      Stretch: Stretch
     }
   },
   created () {

src/common/components/Button.vue

@@ -0,0 +1,17 @@
+<template>
+  <div class="button center-text flex" 
+       :class="{'setting-selected': selected, 'w24': fixedWidth, 'flex-auto': !fixedWidth }"
+       >
+    {{label}}
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    fixedWidth: Boolean,
+    selected: Boolean,
+    label: String,
+  }
+}
+</script>

src/common/components/JsonEditor/JsonArray.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="flex flex-col json-level-indent">
+  <div class="flex flex-column json-level-indent">
     <div class="flex flex-row" @click="expanded_internal = !expanded_internal">
       <div v-if="value_internal.key" class="item-key">
-        "{{value_internal.key}}" <b>:</b>
+        "{{value_internal.key}}" <b>:</b> 
         <span v-if="!expanded_internal"><b> [</b> ... <b>]</b>,</span>
         <template v-else><b>[</b></template>
       </div>

src/common/components/JsonEditor/JsonObject.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="flex flex-col json-level-indent">
+  <div class="flex flex-column json-level-indent">
     <div class="flex flex-row" @click="expanded_internal = !expanded_internal">
       <div class="item-key-line">
         <template v-if="label">
           <b>
             <span class="item-key">"{{label}}"</span>
           :
-          </b>
+          </b> 
         </template>
         <span v-if="!expanded_internal"><b> {</b> ... <b>}</b>,</span>
         <template v-else><b>{</b></template>
@@ -88,4 +88,4 @@ export default {
 </script>
 
 <style lang="scss" scoped src="./json.scss">
-</style>
+</style>

src/common/components/QsElement.vue

@@ -21,7 +21,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style>
 .mt2px {
   margin-top: 7px;
 }

src/common/components/QuerySelectorSetting.vue

@@ -1,17 +1,17 @@
 <template>
-  <div class="flex flex-col">
+  <div class="flex flex-column">
     <div v-if="!editing && !adding" class="flex flex-row">
       <div class="">
         <b>Query selector:</b> {{qs.string}}<br/>
         <b>Additional CSS:</b> {{qs.css || 'no style rules'}}
       </div>
-      <div class="flex flex-col flex-nogrow">
+      <div class="flex flex-column flex-nogrow">
         <a @click="editing = true">Edit</a>
         <a @click="$emit('delete')">Delete</a>
       </div>
     </div>
     <div v-else class="flex flex-row">
-      <div class="flex flex-col">
+      <div class="flex flex-column">
         <div class="flex flex-row">
           <div class="flex label-secondary form-label">
             Query selector:

src/common/components/ShortcutButton.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col flex-center">
+  <div class="flex flex-column flex-center">
     <div class="flex flex-self-center">
       {{label}}
     </div>
@@ -20,7 +20,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .center-text {
   text-align: center;
 }

src/common/data/notifications.js

@@ -1,14 +0,0 @@
-let Notifications = Object.freeze({
-  'TEST_NOTIFICATION': {
-    icon: 'card-text',
-    text: 'This is a test notification.',
-    timeout: -1,
-  },
-  'AARD_DRM': {
-    icon: 'exclamation-triangle',
-    text: '<b>Autodetection may not be able to run on this video.</b> On sites that utilize DRM you will have to set aspect ratio manually.',
-    timeout: 5000,
-  }
-});
-
-export default Notifications;

src/common/enums/AntiGradientMode.enum.ts

@@ -1,7 +0,0 @@
-enum AntiGradientMode {
-  Disabled = 0,
-  Lax = 1,
-  Strict = 2
-}
-
-export default AntiGradientMode;

src/common/enums/AspectRatioType.enum.ts

@@ -1,13 +0,0 @@
-enum AspectRatioType {
-  Cycle = -2,
-  Initial = -1,        // page default
-  Reset = 0,           // reset to initial
-  Automatic = 1,       // we want to request automatic aspect ratio detection
-  FitWidth = 2,        // legacy/dynamic = fit to width
-  FitHeight = 3,       // legacy/dynamic = fit to height
-  Fixed = 4,           // pre-determined aspect ratio
-  Manual = 5,          // ratio achieved by zooming in/zooming out
-  AutomaticUpdate = 6, // set by Aard
-}
-
-export default AspectRatioType;

src/common/enums/CropModePersistence.enum.ts

@@ -1,9 +0,0 @@
-enum CropModePersistence {
-  Default = -1,
-  Disabled = 0,
-  UntilPageReload = 1,
-  CurrentSession = 2,
-  Forever = 3,
-}
-
-export default CropModePersistence;

src/common/enums/ExtensionMode.enum.ts

@@ -1,10 +0,0 @@
-enum ExtensionMode {
-  AutoDisabled = -2,
-  Disabled = -1,
-  Default = 0,
-  Whitelist = 1,
-  Basic = 2,
-  Enabled = 3,
-};
-
-export default ExtensionMode;

src/common/enums/StretchType.enum.ts

@@ -1,11 +0,0 @@
-enum StretchType {
-  NoStretch = 0,
-  Basic = 1,
-  Hybrid = 2,
-  Conditional = 3,
-  Fixed = 4,
-  FixedSource = 5,
-  Default = -1
-};
-
-export default StretchType;

src/common/enums/VideoAlignmentType.enum.ts

@@ -1,10 +0,0 @@
-enum VideoAlignmentType {
-  Left = 0,
-  Center = 1,
-  Right = 2,
-  Top = 3,
-  Bottom = 4,
-  Default = -1
-};
-
-export default VideoAlignmentType;

src/common/enums/anti-gradient-mode.enum.js

@@ -0,0 +1,7 @@
+var AntiGradientMode = Object.freeze({
+  Disabled: 0,
+  Lax: 1,
+  Strict: 2
+});
+
+export default AntiGradientMode;

src/common/enums/aspect-ratio.enum.js

@@ -0,0 +1,10 @@
+var AspectRatio = Object.freeze({
+  Initial: -1,
+  Reset: 0,
+  Automatic: 1,
+  FitWidth: 2,
+  FitHeight: 3,
+  Fixed: 4,
+});
+
+export default AspectRatio;

src/common/enums/crop-mode-persistence.enum.js

@@ -0,0 +1,9 @@
+var CropModePersistence = Object.freeze({
+  Default: -1,
+  Disabled: 0,
+  UntilPageReload: 1,
+  CurrentSession: 2,
+  Forever: 3,
+});
+
+export default CropModePersistence;

src/common/enums/extension-mode.enum.js

@@ -0,0 +1,15 @@
+if (process.env.CHANNEL !== 'stable') {
+  console.log('Loaded ExtensionMode');
+}
+
+
+var ExtensionMode = Object.freeze({
+  AutoDisabled: -2,
+  Disabled: -1,
+  Default: 0,
+  Whitelist: 1,
+  Basic: 2,
+  Enabled: 3,
+});
+
+export default ExtensionMode;

src/common/enums/stretch.enum.js

@@ -0,0 +1,11 @@
+var Stretch = Object.freeze({
+  NoStretch: 0,
+  Basic: 1,
+  Hybrid: 2,
+  Conditional: 3,
+  Fixed: 4,
+  FixedSource: 5,
+  Default: -1
+});
+
+export default Stretch;

src/common/enums/video-alignment.enum.js

@@ -0,0 +1,8 @@
+var VideoAlignment = Object.freeze({
+  Left: 0,
+  Center: 1,
+  Right: 2,
+  Default: -1
+});
+
+export default VideoAlignment;

src/common/interfaces/ArInterface.ts

@@ -1,6 +0,0 @@
-import AspectRatioType from '../enums/AspectRatioType.enum';
-
-export interface Ar {
-  type: AspectRatioType,
-  ratio?: number
-}

src/common/interfaces/SettingsInterface.ts

@@ -1,418 +0,0 @@
-import { Action } from '../../../node_modules/vuex/types/index'
-import AntiGradientMode from '../enums/AntiGradientMode.enum'
-import AspectRatioType from '../enums/AspectRatioType.enum'
-import CropModePersistence from '../enums/CropModePersistence.enum'
-import ExtensionMode from '../enums/ExtensionMode.enum'
-import StretchType from '../enums/StretchType.enum'
-import VideoAlignmentType from '../enums/VideoAlignmentType.enum'
-
-export interface KeyboardShortcutInterface {
-  key?: string,
-  code?: string,
-  ctrlKey?: boolean,
-  metaKey?: boolean,
-  altKey?: boolean,
-  shiftKey?: boolean,
-  onKeyUp?: boolean,
-  onKeyDown?: boolean,
-  onMouseMove?: boolean,
-}
-
-interface ActionScopeInterface {
-  show: boolean,
-  label?: string,   // example override, takes precedence over default label
-  shortcut?: KeyboardShortcutInterface[],
-}
-
-interface RestrictionsSettings {
-  disableOnSmallPlayers?: boolean;    // Whether ultrawidify should disable itself when the player is small
-  minAllowedWidth?: number;           // if player is less than this many px wide, ultrawidify will disable itself
-  minAllowedHeight?: number;          // if player is less than this many px tall, ultrawidify will disable itself
-  onlyAllowInFullscreen?: boolean;    // if enabled, ultrawidify will be disabled when not in full screen regardless of what previous two options say
-  onlyAllowAutodetectionInFullScreen?: boolean;  // if enabled, autodetection will only start once in full screen
-}
-
-interface ExtensionEnvironmentSettingsInterface {
-  normal: ExtensionMode,
-  theater: ExtensionMode,
-  fullscreen: ExtensionMode,
-}
-
-export interface CommandInterface {
-  action: string,
-  label: string,
-  comment?: string,
-  arguments?: any,
-  shortcut?: KeyboardShortcutInterface,
-  internalOnly?: boolean,
-  actionId?: string,
-}
-
-export type SettingsReloadComponent = 'PlayerData' | 'VideoData';
-export type SettingsReloadFlags = true | SettingsReloadComponent;
-
-export interface AardSettings {
-  aardType: 'webgl' | 'legacy' | 'auto';
-
-  disabledReason: string,     // if automatic aspect ratio has been disabled, show reason
-  allowedMisaligned: number,  // top and bottom letterbox thickness can differ by this much.
-                              // Any more and we don't adjust ar.
-  allowedArVariance: number,  // amount by which old ar can differ from the new (1 = 100%)
-  timers: {                   // autodetection frequency
-    playing: number,            // while playing
-    paused: number,             // while paused
-    error: number,              // after error
-    minimumTimeout: number,
-    tickrate: number,          // 1 tick every this many milliseconds
-  },
-  autoDisable: {            // settings for automatically disabling the extension
-    maxExecutionTime: number, // if execution time of main autodetect loop exceeds this many milliseconds,
-                            // we disable it.
-    consecutiveTimeoutCount: number,  // we only do it if it happens this many consecutive times
-
-    // FOR FUTURE USE
-    consecutiveArResets: number       // if aspect ratio reverts immediately after AR change is applied, we disable everything
-  },
-  canvasDimensions: {
-    blackframeCanvas: {   // smaller than sample canvas, blackframe canvas is used to recon for black frames
-                          // it's not used to detect aspect ratio by itself, so it can be tiny af
-      width: number,
-      height: number,
-    },
-    sampleCanvas: {   // size of image sample for detecting aspect ratio. Bigger size means more accurate results,
-                          // at the expense of performance
-      width: number,
-      height: number,
-    },
-  },
-
-  // NOTE: Black Frame is currently not in use.
-  blackframe: {
-    sufficientColorVariance: number,  // calculate difference between average intensity and pixel, for every pixel for every color
-                                    // component. Average intensity is normalized to where 0 is black and 1 is biggest value for
-                                    // that component. If sum of differences between normalized average intensity and normalized
-                                    // component varies more than this % between color components, we can afford to use less strict
-                                    // cumulative threshold.
-    cumulativeThresholdLax: number,
-    cumulativeThresholdStrict: number,// if we add values of all pixels together and get more than this, the frame is bright enough.
-                               // (note: blackframe is 16x9 px -> 144px total. cumulative threshold can be reached fast)
-    blackPixelsCondition: number, // How much pixels must be black (1 all, 0 none) before we consider frame as black. Takes
-                               // precedence over cumulative threshold: if blackPixelsCondition is met, the frame is dark
-                               // regardless of whether cumulative threshold has been reached.
-  },
-
-  // Used by old aspect ratio detection algorithm. Pls remove.
-  blackbar: {
-    blackLevel: number,         // everything darker than 10/255 across all RGB components is considered black by
-                            // default. blackLevel can decrease if we detect darker black.
-    threshold: number,          // if pixel is darker than the sum of black level and this value, we count it as black
-                            // on 0-255. Needs to be fairly high (8 might not cut it) due to compression
-                            // artifacts in the video itself
-    frameThreshold: number,      // threshold, but when doing blackframe test
-    imageThreshold: number,     // in order to detect pixel as "not black", the pixel must be brighter than
-                            // the sum of black level, threshold and this value.
-    gradientThreshold: number,   // When trying to determine thickness of the black bars, we take 2 values: position of
-                            // the last pixel that's darker than our threshold, and position of the first pixel that's
-                            // brighter than our image threshold. If positions are more than this many pixels apart,
-                            // we assume we aren't looking at letterbox and thus don't correct the aspect ratio.
-    gradientSampleSize: number, // How far do we look to find the gradient
-    maxGradient: number,         // if two neighboring pixels in gradientSampleSize differ by more than this, then we aren't
-                            // looking at a gradient
-    gradientNegativeTreshold: number,
-    gradientMaxSD: number,    // reserved for future use
-    antiGradientMode: AntiGradientMode
-  },
-  // Also not in use, probs.
-  variableBlackbarThresholdOptions: {    // In case of poor bitrate videos, jpeg artifacts may cause us issues
-    // FOR FUTURE USE
-    enabled: boolean,                      // allow increasing blackbar threshold
-    disableArDetectOnMax: boolean,         // disable autodetection when threshold goes over max blackbar threshold
-    maxBlackbarThreshold: number,            // max threshold (don't increase past this)
-    thresholdStep: number,                   // when failing to set aspect ratio, increase threshold by this much
-    increaseAfterConsecutiveResets: number   // increase if AR resets this many times in a row
-  },
-  blackLevels: {
-    defaultBlack: number,    // By default, pixels darker than this are considered black.
-                             // (If detection algorithm detects darker blacks, black is considered darkest detected pixel)
-    blackTolerance: number,  // If pixel is more than this much brighter than blackLevel, it's considered not black
-                             // It is not considered a valid image detection if gradient detection is enabled
-    imageDelta: number,      // When gradient detection is enabled, pixels this much brighter than black skip gradient detection
-  }
-  sampling: {
-    edgePosition: number;    // % of width (max 0.33). Pixels up to this far away from either edge may contain logo.
-    staticCols: number,      // we take a column at [0-n]/n-th parts along the width and sample it
-    randomCols: number,      // we add this many randomly selected columns to the static columns
-    staticRows: number,      // forms grid with staticSampleCols. Determined in the same way. For black frame checks,
-  },
-  guardLine: {              // all pixels on the guardline need to be black, or else we trigger AR recalculation
-                            // (if AR fails to be recalculated, we reset AR)
-    enabled: boolean,
-    ignoreEdgeMargin: number, // we ignore anything that pokes over the black line this close to the edge
-                            // (relative to width of the sample)
-    imageTestThreshold: number, // when testing for image, this much pixels must be over blackbarThreshold
-    edgeTolerancePx: number,         // black edge violation is performed this far from reported 'last black pixel'
-    edgeTolerancePercent: null  // unused. same as above, except use % of canvas height instead of pixels
-  },
-  arSwitchLimiter: {          // to be implemented
-    switches: number,              // we can switch this many times
-      period: number             // per this period
-  },
-
-
-  // pls deprecate and move things used
-  edgeDetection: {
-    slopeTestWidth: number,
-    gradientTestSamples: number,         // we check this many pixels below (or above) the suspected edge to check for gradient
-    gradientTestBlackThreshold: number,  // if pixel in test sample is brighter than that, we aren't looking at gradient
-    gradientTestDeltaThreshold: number,  // if delta between two adjacent pixels in gradient test exceeds this, it's not gradient
-    gradientTestMinDelta: number,        // if last pixels of the test sample is less than this brighter than the first -> not gradient
-
-    thresholds: {
-      edgeDetectionLimit: number,             // during scanning of the edge, quit after edge gets detected at this many points
-      minQualitySingleEdge: number,           // At least one of the detected must reach this quality
-      minQualitySecondEdge: number,           // The other edge must reach this quality (must be smaller or equal to single edge quality)
-    }
-
-    maxLetterboxOffset: 0.1,             // Upper and lower letterbox can be different by this many (% of height)
-
-    // Previous iteration variables VVVV
-    sampleWidth: number,        // we take a sample this wide for edge detection
-    detectionThreshold: number,  // sample needs to have this many non-black pixels to be a valid edge
-    confirmationThreshold: number,  //
-    singleSideConfirmationThreshold: number,    // we need this much edges (out of all samples, not just edges) in order
-                                           // to confirm an edge in case there's no edges on top or bottom (other
-                                          // than logo, of course)
-    logoThreshold: number,     // if edge candidate sits with count greater than this*all_samples, it can't be logo
-                            // or watermark.
-    edgeTolerancePx?: number,          // we check for black edge violation this far from detection point
-    edgeTolerancePercent?: number,  // we check for black edge detection this % of height from detection point. unused
-    middleIgnoredArea: number,      // we ignore this % of canvas height towards edges while detecting aspect ratios
-    minColsForSearch: number,       // if we hit the edge of blackbars for all but this many columns (%-wise), we don't
-                                 // continue with search. It's pointless, because black edge is higher/lower than we
-                                 // are now. (NOTE: keep this less than 1 in case we implement logo detection)
-  },
-  pillarTest: {
-    ignoreThinPillarsPx: number, // ignore pillars that are less than this many pixels thick.
-    allowMisaligned: number   // left and right edge can vary this much (%)
-  },
-  textLineTest: {
-    nonTextPulse: number,     // if a single continuous pulse has this many non-black pixels, we aren't dealing
-                            // with text. This value is relative to canvas width (%)
-    pulsesToConfirm: number,    // this is a threshold to confirm we're seeing text.
-    pulsesToConfirmIfHalfBlack: number, // this is the threshold to confirm we're seeing text if longest black pulse
-                                   // is over 50% of the canvas width
-    testRowOffset: number     // we test this % of height from detected edge
-  }
-}
-
-interface SettingsInterface {
-  _updateFlags?: {
-    requireReload?: SettingsReloadFlags,
-    forSite?: string
-  }
-
-  arDetect: AardSettings,
-
-  ui: {
-    inPlayer: {
-      enabled: boolean,
-      enabledFullscreenOnly: boolean,
-      popupAlignment: 'left' | 'right',
-      minEnabledWidth: number,                 // don't show UI if player is narrower than % of screen width
-      minEnabledHeight: number,                // don't show UI if player is narrower than % of screen height
-      activation: 'trigger-zone' | 'player',   // what needs to be hovered in order for UI to be visible
-      triggerZoneDimensions: {                 // how large the trigger zone is (relative to player size)
-        width: number
-        height: number,
-        offsetX: number,                       // fed to translateX(offsetX + '%'). Valid range [-100,   0]
-        offsetY: number                        // fed to translateY(offsetY + '%'). Valid range [-100, 100]
-      },
-    }
-  }
-
-  restrictions?: RestrictionsSettings;
-
-  crop: {
-    default: any;
-  },
-  stretch: {
-    default: any;
-    conditionalDifferencePercent: number  // black bars less than this wide will trigger stretch
-                                        // if mode is set to '1'. 1.0=100%
-  },
-  kbm: {
-    enabled: boolean,          // if keyboard/mouse handler service will run
-    keyboardEnabled: boolean,  // if keyboard shortcuts are processed
-    mouseEnabled: boolean,     // if mouse movement is processed
-  }
-
-  zoom: {
-    minLogZoom: number,
-    maxLogZoom: number,
-    announceDebounce: number     // we wait this long before announcing new zoom
-  },
-
-  miscSettings: {
-    mousePan: {
-      enabled: boolean
-    },
-    mousePanReverseMouse: boolean,
-    defaultAr?: any
-  },
-
-  resizer: {
-    setStyleString: {
-      maxRetries: number,
-      retryTimeout: number
-    }
-  },
-  pageInfo: {
-    timeouts: {
-      urlCheck: number,
-      rescan: number
-    }
-  },
-  pan?: any,
-  version?: string,
-  preventReload?: boolean,
-
-  // -----------------------------------------
-  //           ::: MITIGATIONS :::
-  // -----------------------------------------
-  // Settings for browser bug workarounds.
-  mitigations?: {
-    zoomLimit?: {
-      enabled?: boolean,
-      fullscreenOnly?: boolean,
-      limit?: number,
-    }
-  }
-  // -----------------------------------------
-  //             ::: ACTIONS :::
-  // -----------------------------------------
-  // Nastavitve za ukaze. Zamenja stare nastavitve za bližnične tipke.
-  //
-  // Polje 'shortcut' je tabela, če se slučajno lotimo kdaj delati choordov.
-  actions: {
-    name?: string,    // name displayed in settings
-    label?: string,                     // name displayed in ui (can be overridden in scope/playerUi)
-    cmd?: {
-      action: string,
-      arg: any,
-      customArg?: any,
-      persistent?: boolean, // optional, false by default. If true, change doesn't take effect immediately.
-                         // Instead, this action saves stuff to settings
-    }[],
-    scopes?: {
-      global?: ActionScopeInterface,
-      site?: ActionScopeInterface,
-      page?: ActionScopeInterface
-    },
-    playerUi?: {
-      show: boolean,
-      path?: string,
-    },
-    userAdded?: boolean,
-  }[],
-  // This object fulfills the same purpose as 'actions', but is written in less retarded and overly
-  // complicated way. Hopefully it'll be easier to maintain it that way.
-  commands?: {
-    crop?: CommandInterface[],
-    stretch?: CommandInterface[],
-    zoom?: CommandInterface[],
-    pan?: CommandInterface[],
-    internal?: CommandInterface[],
-  },
-  whatsNewChecked: boolean,
-  newFeatureTracker: any,
-  // -----------------------------------------
-  //       ::: SITE CONFIGURATION :::
-  // -----------------------------------------
-  // Config for a given page:
-  //
-  // <hostname> : {
-  //    status: <option>              // should extension work on this site?
-  //    arStatus: <option>            // should we do autodetection on this site?
-  //
-  //    defaultAr?: <ratio>          // automatically apply this aspect ratio on this side. Use extension defaults if undefined.
-  //    stretch? <stretch mode>       // automatically stretch video on this site in this manner
-  //    videoAlignment? <left|center|right>
-  //
-  //    type: <official|community|user>  // 'official' — blessed by Tam.
-  //                                     // 'community' — blessed by reddit.
-  //                                     // 'user' — user-defined (not here)
-  //    override: <true|false>           // override user settings for this site on update
-  // }
-  //
-  // Valid values for options:
-  //
-  //     status, arStatus, statusEmbedded:
-  //
-  //    * enabled     — always allow, full
-  //    * basic       — allow, but only the basic version without playerData
-  //    * default     — allow if default is to allow, block if default is to block
-  //    * disabled    — never allow
-  //
-  sites: {
-    [x: string]: SiteSettingsInterface,
-  }
-}
-
-export interface SiteSettingsInterface {
-  enable: ExtensionEnvironmentSettingsInterface;
-  enableAard: ExtensionEnvironmentSettingsInterface;
-  enableKeyboard: ExtensionEnvironmentSettingsInterface;
-
-  type?: 'official' | 'community' | 'user-defined' | 'testing' | 'officially-disabled' | 'unknown' | 'modified';
-  defaultType: 'official' | 'community' | 'user-defined' | 'testing' | 'officially-disabled' | 'unknown' | 'modified';
-
-  // must be defined in @global and @empty
-  persistCSA?: CropModePersistence,  // CSA - crop, stretch, alignment
-
-  defaults?: {       // must be defined in @global and @empty
-    crop?: {type: AspectRatioType, [x: string]: any},
-    stretch?: StretchType,
-    alignment?: {x: VideoAlignmentType, y: VideoAlignmentType},
-  }
-
-  cropModePersistence?: CropModePersistence;
-  stretchModePersistence?: CropModePersistence;
-  alignmentPersistence?: CropModePersistence;
-
-
-  activeDOMConfig?: string;
-  DOMConfig?: { [x: string]: SiteDOMSettingsInterface };
-
-  // the following script are for extension caching and shouldn't be saved.
-  // if they _are_ saved, they will be overwritten
-  currentDOMConfig?: SiteDOMSettingsInterface;
-
-  // the following fields are for use with extension update script
-  override?: boolean;   // whether settings for this site will be overwritten by extension upgrade script
-}
-
-export interface SiteDOMSettingsInterface {
-  type: 'official' | 'community' | 'user-defined' | 'modified' | undefined;
-  elements?: {
-    player?: SiteDOMElementSettingsInterface,
-    video?: SiteDOMElementSettingsInterface,
-    other?: { [x: number]: SiteDOMElementSettingsInterface }
-  };
-  customCss?: string;
-  periodicallyRefreshPlayerElement?: boolean;
-
-  // the following script are for extension caching and shouldn't be saved.
-  // if they _are_ saved, they will be overwritten
-  anchorElementIndex?: number;
-  anchorElement?: HTMLElement;
-}
-
-export interface SiteDOMElementSettingsInterface {
-  manual?: boolean;
-  querySelectors?: string;
-  index?: number; // previously: useRelativeAncestor + videoAncestor
-  mode?: 'index' | 'qs';
-  nodeCss?: {[x: string]: string};
-}
-
-export default SettingsInterface;

src/common/js/ChromeShittinessMitigations.ts

@@ -1,33 +0,0 @@
-/**
- * For some reason, Chrome really doesn't like when chrome.runtime
- * methods are wrapped inside a ES6 proxy object. If 'port' is a
- * ES6 Proxy of a Port object that `chrome.runtime.connect()` creates,
- * then Chrome will do bullshits like `port.sendMessage` and
- * `port.onMessage.addListener` crashing your Vue3 UI with bullshits
- * excuses, e.g.
- *
- *   | TypeError: Illegal invocation. Function must be called on
- *   | an object of type Port
- *
- * which is some grade A bullshit because Firefox can handle that just
- * fine.
- *
- * There's two ways how I could handle this:
- *   * Find out how to get the original object from the proxy Vue3
- *     creates, which would take time and ruin my xmass holiday, or
- *   * make a global object with a passive-aggressive name and ignore
- *     the very real possibility that there's prolly a reason Chrome
- *     does things in its own very special(tm) way, as if it had one
- *     extra chromosome over Firefox.
- *
- * Easy choice, really.
- */
-export class ChromeShittinessMitigations {
-  static port = null;
-
-  static setProperty(property, value) {
-    ChromeShittinessMitigations[property] = value;
-  }
-}
-
-export default ChromeShittinessMitigations;

src/common/js/KeyboardShortcutParser.js

@@ -1,7 +1,7 @@
 class KeyboardShortcutParser {
   static parseShortcut(keypress) {
     let shortcutCombo = '';
-
+  
     if (keypress.ctrlKey) {
       shortcutCombo += 'Ctrl + ';
     }
@@ -21,20 +21,6 @@ class KeyboardShortcutParser {
     }
     return shortcutCombo;
   }
-
-  static generateShortcutFromKeypress(event) {
-    return {
-      ctrlKey: event.ctrlKey,
-      altKey: event.altKey,
-      shiftKey: event.shiftKey,
-      metaKey: event.metaKey,
-      code: event.code,
-      key: event.key,
-      keyup: true,
-      keydown: false,
-      type: event.type,     // only needed for purposes of EditShortcutButton
-    }
-  }
 }
 
-export default KeyboardShortcutParser;
+export default KeyboardShortcutParser;

src/common/js/utils.js

@@ -1,3 +1,3 @@
 export async function sleep(timeout) {
-  return new Promise( (resolve, reject) => setTimeout(() => resolve(null), timeout));
+  return new Promise( (resolve, reject) => setTimeout(() => resolve(), timeout));
 }

src/common/js/utils.ts

@@ -1,18 +0,0 @@
-export async function sleep(timeout) {
-  return new Promise<void>( (resolve, reject) => setTimeout(() => resolve(), timeout));
-}
-
-/**
- * Creates deep copy of an object
- * @param obj
- * @returns
- */
-export function _cp(obj) {
-  try {
-    return JSON.parse(JSON.stringify(obj));
-  } catch (e) {
-    // console.error('Failed to parse json. This probably means that the data we received was not an object. Will return data as-is');
-    // console.error('data in:', obj, 'error:', e);
-    return obj;
-  }
-}

src/common/mixins/ComputeActionsMixin.js

@@ -1,7 +1,7 @@
 export default {
   computed: {
     scopeActions: function() {
-      return this.settings?.active.actions?.filter(x => {
+      return this.settings.active.actions.filter(x => {
         if (! x.scopes) {
           console.error('This action does not have a scope.', x);
           return false;
@@ -10,7 +10,7 @@ export default {
       }) || [];
     },
     extensionActions: function(){
-      return this.scopeActions.filter(x => x.cmd.length === 1 && x.cmd[0].action === 'set-ExtensionMode') || [];
+      return this.scopeActions.filter(x => x.cmd.length === 1 && x.cmd[0].action === 'set-extension-mode') || [];
     },
     aardActions: function(){
       return this.scopeActions.filter(x => x.cmd.length === 1 && x.cmd[0].action === 'set-autoar-mode') || [];

src/csui/GlobalFrame.vue

@@ -1,69 +0,0 @@
-<template>
-  <div class="uw-clickthrough relative w-100 h-100">
-    <template v-for="rectangle of drawnRectangles" :key="rectangle.id ?? rectangle">
-
-      <!-- Player element overlays -->
-      <div class="absolute z-index-overlay"
-        :style="rectangle.style"
-      >
-        <!-- used for drawing player element overlay rectangles - keep this section empty -->
-      </div>
-
-      <!-- Notification overlay -->
-      <div class="absolute z-index-notification notification-area">
-        <template v-for="notification of displayedNotifications" :key="notification.id">
-          <div class="notification d-flex flex-row">
-            <div class="notification-icon">
-              <mdicon :name="notification.icon ?? 'alert'" :size="128"></mdicon>
-            </div>
-            <div class="notification-text">
-              <h3 class="notification-title">{{ notification.title }}</h3>
-              <p class="notification-verbose">{{ notification.text }}</p>
-            </div>
-          </div>
-        </template>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-import UIProbeMixin from './src/utils/UIProbeMixin';
-
-export default {
-  components: {
-  },
-  mixins: [
-    UIProbeMixin
-  ],
-  data() {
-    return {
-      drawnRectangles: [],
-      displayedNotifications: [],
-    }
-  },
-
-  async created() {
-    this.logger = new Logger();
-
-    // this prolly needs to be taken out
-    await this.logger.init({
-      allowLogging: true,
-    });
-
-    /**
-     * Setup the "companion" onMouseMove handler to the one in the content script.
-     * We can handle events with the same function we use to handle events from
-     * the content script.
-     */
-     document.addEventListener('mousemove', (event) => {
-      this.handleProbe({
-        coords: {
-          x: event.clientX,
-          y: event.clientY
-        }
-      }, this.origin);
-    });
-  }
-}
-</script>

src/csui/LoggerUi.vue

@@ -0,0 +1,437 @@
+<template>
+  <div v-if="showLoggerUi" class="root-window flex flex-column overflow-hidden"
+       @keyup.stop
+       @keydown.stop
+       @keypress.stop
+  >
+    <div class="header">
+      <div class="header-top flex flex-row">
+        <div class="flex-grow">
+          <h1>{{header.header}}</h1>
+        </div>
+        <div class="button flex-noshrink button-header"
+            @click="hidePopup()"
+        >
+          <template v-if="logStringified">Finish logging</template>
+          <template v-else>Hide popup</template>
+        </div>
+        <!-- <div class="button flex-noshrink button-header"
+             @click="stopLogging()"
+        >
+          Stop logging
+        </div> -->
+      </div>
+      <div class="header-bottom">
+        <div>{{header.subheader}}</div>
+      </div>
+    </div>
+    <div class="content flex flex-row flex-grow overflow-hidden">
+
+      <!-- LOGGER SETTINGS PANEL -->
+      <div class="settings-panel flex flex-noshrink flex-column">
+        <div class="panel-top flex-nogrow">
+          <h2>Logger configuration</h2>
+        </div>
+        <div class="flex flex-row flex-end w100">
+          <div v-if="!showTextMode" class="button" @click="showTextMode = true">
+            Paste config ...
+          </div>
+          <div v-else class="button" @click="showTextMode = false">
+            Back
+          </div>
+        </div>
+
+        <div class="panel-middle scrollable flex-grow log-config-margin">
+          <template v-if="showTextMode">
+            <div ref="settingsEditArea"
+              style="white-space: pre-wrap; border: 1px solid orange; padding: 10px;"
+              class="monospace h100"
+              :class="{'jsonbg': !confHasError, 'jsonbg-error': confHasError}"
+              contenteditable="true"
+              @input="updateSettings"
+            >
+              {{parsedSettings}}
+            </div>
+          </template>
+          <template v-else>
+            <JsonObject label="logger-settings" 
+                        :value="currentSettings" 
+                        :ignoreKeys="{'allowLogging': true}"
+                        @change="updateSettingsUi"
+            ></JsonObject>
+          </template>
+        </div>
+
+
+        <div class="flex flex-row flex-end">
+          <div class="button" @click="restoreLoggerSettings()">
+            Revert
+          </div>
+          <div class="button button-primary" @click="saveLoggerSettings()">
+            Save
+          </div>
+        </div>
+      </div>
+
+      <!-- LOGGER OUTPUT/START LOGGING -->
+      <div class="results-panel flex flex-shrink flex-column overflow-hidden">
+        <div class="panel-top flex-nogrow">
+          <h2>Logger results</h2>
+        </div>
+        <template v-if="logStringified">
+          <div v-if="confHasError" class="warn">
+            Logger configuration contains an error. You can export current log, but you will be unable to record a new log.
+          </div>
+          <div class="panel-middle scrollable flex-grow p-t-025em">
+            <pre>
+              {{logStringified}}
+            </pre>
+          </div>
+          <div class="flex-noshrink flex flex-row flex-end p-t-025em">
+            <div class="button button-bar"
+                 @click="startLogging()"
+            >
+              New log
+            </div>
+            <div class="button button-bar"
+                 @click="exportLog()"
+            >
+              Export log
+            </div>
+            <div class="button button-bar button-primary"
+                 @click="exportAndQuit()"
+            >
+              Export & finish
+            </div>
+          </div>
+        </template>
+        <template v-else>
+          <div class="panel-middle scrollable flex-grow">
+            <div v-if="!parsedSettings" class="text-center w100">
+              Please paste logger config into the text box to the left.
+              ←←←
+            </div>
+            <div v-else-if="confHasError" class="warn">
+              Logger configuration contains an error. Cannot start logging.
+            </div>
+            <div v-else-if="lastSettings && lastSettings.allowLogging && lastSettings.consoleOptions && lastSettings.consoleOptions.enabled"
+                 class="flex flex-column flex-center flex-cross-center w100 h100"
+            >
+              <p class="m-025em">
+                Logging in progress ...
+              </p>
+              <div class="button button-big button-primary"
+                   @click="stopLogging()"
+              >
+                Stop logging
+              </div>
+              <template v-if="lastSettings && lastSettings.timeout"
+                        class="m-025em"
+              >
+                <p>
+                  ... or wait until logging ends.
+                </p>
+                <p>
+                  You can <a @click="hidePopup()">hide popup</a> — it will automatically re-appear when logging finishes.
+                </p>
+              </template>
+              <template v-else-if="lastSettings">
+                <p>
+                  You can <a @click="hidePopup()">hide popup</a> — the logging will continue until you re-open the popup and stop it.
+                </p>
+              </template>
+            </div>
+            <div v-else class="flex flex-column flex-center flex-cross-center w100 h100">
+              <div class="button button-big button-primary"
+                   @click="startLogging()"
+              >
+                Start logging
+              </div>
+            </div>
+          </div>
+        </template>
+      </div>
+    </div>
+    <!-- <div>
+      button row is heres
+    </div> -->
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import Logger from '../ext/lib/Logger';
+import Comms from '../ext/lib/comms/Comms';
+import IO from '../common/js/IO';
+import JsonObject from '../common/components/JsonEditor/JsonObject';
+
+export default {
+  components: {
+    JsonObject,
+  },
+  data() {
+    return {
+      showLoggerUi: false,
+      header: {
+        header: 'whoopsie daisy',
+        subheader: 'you broke the header choosing script'
+      },
+      parsedSettings: '',
+      lastSettings: {},
+      currentSettings: {},
+      confHasError: false,
+      logStringified: '',
+      showTextMode: false,
+    }
+  },
+  async created() {
+    const headerRotation = [{
+      header: "DEFORESTATOR 5000",
+      subheader: "Iron Legion's finest logging tool"
+    }, {
+      header: "Astinus",
+      subheader: "Ultrawidify logging tool"
+    }, {
+      header: "Tracer",
+      subheader: "I'm already printing stack traces"
+    }];
+
+    this.header = headerRotation[Math.floor(+Date.now() / (3600000*24)) % headerRotation.length] || this.header;
+
+    this.getLoggerSettings();
+  },
+  computed: {
+    ...mapState([
+      'uwLog',
+      'showLogger',
+      'loggingEnded',
+    ]),
+  },
+  watch: {
+    uwLog(newValue, oldValue)  {
+      if (oldValue !== newValue) {
+        this.$store.dispatch('uw-show-logger');
+        this.logStringified = JSON.stringify(newValue, null, 2);
+      }
+    },
+    async showLogger(newValue) {
+      this.showLoggerUi = newValue;
+
+      // update logger settings (they could have changed while the popup was closed)
+      if (newValue) {
+        this.getLoggerSettings();
+      }
+    },
+    loggingEnded(newValue) {
+      // note — the value of loggingEnded never actually matters. Even if this value is 'true'
+      // internally, vuexStore.dspatch() will still do its job and give us the signal we want
+      if (newValue) {
+        this.stopLogging();
+      }
+    }
+  },
+  methods: {
+    async getLoggerSettings() {
+      this.lastSettings = await Logger.getConfig() || {};
+      this.parsedSettings = JSON.stringify(this.lastSettings, null, 2) || '';
+      this.currentSettings = JSON.parse(JSON.stringify(this.lastSettings));
+    },
+    updateSettings(val) {
+      try {
+        this.parsedSettings = JSON.stringify(JSON.parse(val.target.textContent.trim()), null, 2);
+        this.lastSettings = JSON.parse(val.target.textContent.trim());
+        this.currentSettings = JSON.parse(JSON.stringify(this.lastSettings));
+        this.confHasError = false;
+      } catch (e) {
+        this.confHasError = true;
+      }
+    },
+    updateSettingsUi(val) {
+      try {
+        this.parsedSettings = JSON.stringify(val, null, 2);
+        this.lastSettings = val;
+        this.currentSettings = JSON.parse(JSON.stringify(this.lastSettings));
+      } catch (e) {
+        
+      }
+    },
+    saveLoggerSettings() {
+      Logger.saveConfig({...this.lastSettings});
+    },
+    restoreLoggerSettings() {
+      this.getLoggerSettings();
+      this.confHasError = false;
+    },
+    async startLogging(){
+      this.logStringified = undefined;
+      await Logger.saveConfig({...this.lastSettings, allowLogging: true});
+      window.location.reload();
+    },
+    hidePopup() {
+      // this function only works as 'close' if logging has finished
+      if (this.logStringified) {
+        Logger.saveConfig({...this.lastSettings, allowLogging: false});
+        this.logStringified = undefined;
+      }
+      this.$store.dispatch('uw-hide-logger');
+    },
+    closePopupAndStopLogging() {
+      Logger.saveConfig({...this.lastSettings, allowLogging: false});
+      this.logStringified = undefined;
+      this.$store.dispatch('uw-hide-logger');
+    },
+    stopLogging() {
+      Logger.saveConfig({...this.lastSettings, allowLogging: false});
+      this.lastSettings.allowLogging = false;
+    },
+    exportLog() {
+      IO.csStringToFile(this.logStringified);
+    },
+    exportAndQuit() {
+      this.exportLog();
+      this.logStringified = undefined;
+      this.closePopupAndStopLogging();
+    }
+  }
+}
+</script>
+
+<style lang="scss" src="../res/css/flex.scss" scoped></style> 
+
+<style lang="scss" scoped>
+@import '../res/css/colors.scss';
+@import '../res/css/font/overpass.css';
+@import '../res/css/font/overpass-mono.css';
+@import '../res/css/common.scss';
+
+
+.root-window {
+  position: fixed !important;
+  top: 5vh !important;
+  left: 5vw !important;
+  width: 90vw !important;
+  height: 90vh !important;
+  z-index: 999999 !important;
+  background-color: rgba( $page-background, 0.9) !important;
+  color: #f1f1f1 !important;
+  font-size: 14px !important;
+
+  box-sizing: border-box !important;
+}
+
+div {
+  font-family: 'Overpass';
+}
+
+h1, h2 {
+  font-family: 'Overpass Thin';
+}
+h1 {
+  font-size: 4em;
+}
+h2 {
+  font-size: 2em;
+}
+
+.header {
+  h1 {
+    margin-bottom: -0.20em;
+    margin-top: 0.0em;
+  }
+  .header-top, .header-bottom {
+    padding-left: 16px;
+    padding-right: 16px;
+  }
+  .header-top {
+    background-color: $popup-header-background !important;
+  }
+  .header-bottom {
+    font-size: 1.75em;
+  }
+}
+.content {
+  box-sizing: border-box;
+  padding: 8px 32px;
+  width: 100%;
+}
+.settings-panel {
+  box-sizing: border-box;
+  padding-right: 8px;
+  flex-grow: 2 !important;
+  min-width: 30% !important;
+  flex-shrink: 0 !important;
+  height: inherit !important;
+}
+.results-panel {
+  box-sizing: border-box;
+  padding-left: 8px;
+  max-width: 70% !important;
+  flex-grow: 5 !important;
+  flex-shrink: 0 !important;
+  height: inherit !important;
+}
+
+.scrollable {
+  overflow: auto;
+}
+
+.overflow-hidden {
+  overflow: hidden;
+}
+
+pre {
+  font-family: 'Overpass Mono';
+}
+
+.m-025em {
+  margin: 0.25em;
+}
+
+.p-t-025em {
+  padding-top: 0.25em;
+}
+
+.button {
+  display: inline-flex;
+  align-items: center;
+  justify-items: center;
+  padding-left: 2em;
+  padding-right: 2em;
+}
+
+.button-primary {
+  background-color: $primary;
+  color: #fff;
+}
+
+.button-big {
+  font-size: 1.5em;
+  padding: 1.75em 3.25em;
+}
+
+.button-bar {
+  font-size: 1.25em;
+  padding: 0.25em 1.25em;
+  margin-left: 0.25em;
+}
+
+.button-header {
+  font-size: 2em;
+  padding-top: 0.1em;
+  padding-left: 1em;
+  padding-right: 1em;
+}
+
+.jsonbg {
+  background-color: #131313;
+}
+.jsonbg-error {
+  background-color: #884420;
+}
+
+.log-config-margin {
+  margin-top: 3em;
+  margin-bottom: 3em;
+}
+
+</style>

src/csui/PlayerOverlay.vue

@@ -1,687 +0,0 @@
-<template>
-  <div
-    class="context-spawn uw-ui-area"
-    style="z-index: 1000;"
-    v-if="!triggerZoneEditorVisible"
-  >
-    <div
-      class="spawn-container uw-ui-trigger"
-      :style="triggerZoneStyles"
-    >
-      &nbsp;
-    </div>
-  </div>
-
-  <div
-    v-if="contextMenuActive || settingsInitialized && uwTriggerZoneVisible && !isGlobal"
-    class="context-spawn uw-clickable uw-ui-area"
-    style="z-index: 1001"
-
-  >
-    <GhettoContextMenu
-      alignment="right" class="uw-menu"
-      @mouseenter="() => {preventContextMenuHide(); newFeatureViewUpdate('uw6.ui-popup')}"
-      @mouseleave="allowContextMenuHide()"
-    >
-      <template v-slot:activator>
-        <div class="context-item">
-          Ultrawidify
-        </div>
-        </template>
-      <slot>
-
-        <!--
-          Didn't manage to ensure that extension status pops up above other menu items in less than 3 minutes with z-index,
-          so wrapping 'status' and 'real menu items' in two different divs, ordering them in the opposite way, and then
-          ensuring correct ordering with flex-direction: column-reverse ended up being easier and faster.
-        -->
-        <div class="menu-width flex-reverse-order">
-          <div style="z-index: 1000">
-            <GhettoContextMenu alignment="right">
-              <template v-slot:activator>
-                Crop
-              </template>
-              <slot>
-                <GhettoContextMenuOption
-                  v-for="(command, index) of settings?.active.commands.crop"
-                  :key="index"
-                  :label="command.label"
-                  :shortcut="getKeyboardShortcutLabel(command)"
-                  @click="execAction(command)"
-                >
-                </GhettoContextMenuOption>
-              </slot>
-            </GhettoContextMenu>
-            <GhettoContextMenu alignment="right">
-              <template v-slot:activator>
-                Stretch
-              </template>
-              <slot>
-                <GhettoContextMenuOption
-                  v-for="(command, index) of settings?.active.commands.stretch"
-                  :key="index"
-                  :label="command.label"
-                  :shortcut="getKeyboardShortcutLabel(command)"
-                  @click="execAction(command)"
-                >
-                </GhettoContextMenuOption>
-              </slot>
-            </GhettoContextMenu>
-            <GhettoContextMenu alignment="right">
-              <template v-slot:activator>
-                <div class="context-item">
-                  Align
-                </div>
-              </template>
-              <slot>
-                <GhettoContextMenuItem :disableHover="true" :css="{'reduced-padding': true}">
-                  <AlignmentOptionsControlComponent
-                    :eventBus="eventBus"
-                  >
-                  </AlignmentOptionsControlComponent>
-                </GhettoContextMenuItem>
-              </slot>
-            </GhettoContextMenu>
-
-            <!-- shortcut for configuring UI  -->
-            <GhettoContextMenuOption
-              v-if="settings.active.newFeatureTracker?.['uw6.ui-popup']?.show > 0"
-              @click="showUwWindow('playerUiSettings')"
-            >
-              <span style="color: #fa6;">Change when and if<br/>this popup appears</span>
-              <span style="font-size: 0.8rem">
-                <span style="font-size: 0.8rem; opacity: 0.5">This menu option will show {{settings.active.newFeatureTracker?.['uw6.ui-popup']?.show}} more<br/> times; or until clicked or dismissed.<br/>
-                Also accessible via:<br/> <span style="font-size: 0.85em">EXTENSION SETTINGS > UI AND KEYBOARD</span>.
-                </span>
-                <br/>
-                <a style="color: #fa6; cursor: pointer;" @click="() => acknowledgeNewFeature('uw6.ui-popup')">Dismiss this option</a>
-              </span>
-            </GhettoContextMenuOption>
-
-            <!--  -->
-            <GhettoContextMenuOption
-              @click="showUwWindow()"
-              label="Extension settings"
-            >
-            </GhettoContextMenuOption>
-            <GhettoContextMenuOption
-              @click="showUwWindow('playerDetection')"
-              label="Incorrect cropping?"
-            >
-            </GhettoContextMenuOption>
-            <GhettoContextMenuOption
-              @click="showUwWindow('about')"
-              label="Not working?"
-            >
-            </GhettoContextMenuOption>
-          </div>
-
-          <div style="z-index: 10000">
-            <GhettoContextMenuItem
-              class="extension-status-messages"
-              :disableHover="true"
-            >
-              Site compatibility:
-              <SupportLevelIndicator
-                :siteSupportLevel="siteSupportLevel"
-              >
-              </SupportLevelIndicator>
-              <div v-if="statusFlags.hasDrm" class="aard-blocked">
-                Autodetection potentially<br/>
-                unavailable due to <a href="https://en.wikipedia.org/wiki/Digital_rights_management">DRM</a>.
-              </div>
-              <div v-else-if="statusFlags.aardErrors?.cors" class="aard-blocked">
-                Autodetection blocked<br/>
-                by site/browser (CORS).
-              </div>
-              <div v-else-if="statusFlags.aardErrors?.webglError" class="aard-blocked">
-                Autodetection unavailable<br/>
-                due to webgl error.
-              </div>
-            </GhettoContextMenuItem>
-          </div>
-        </div>
-      </slot>
-    </GhettoContextMenu>
-  </div>
-
-  <div
-    v-if="settingsInitialized && uwWindowVisible"
-    class="uw-window flex flex-col uw-clickable uw-ui-area"
-    :class="{'fade-out': uwWindowFadeOut}"
-  >
-    <PlayerUIWindow
-      :settings="settings"
-      :eventBus="eventBus"
-      :logger="logger"
-      :in-player="!isGlobal"
-      :site="site"
-      :defaultTab="defaultWindowTab"
-      @close="uwWindowVisible = false"
-      @preventClose="(event) => uwWindowFadeOutDisabled = event"
-    ></PlayerUIWindow>
-  </div>
-
-  <div
-    v-if="triggerZoneEditorVisible"
-    class="context-spawn uw-ui-area"
-    style="z-index: 1000;"
-  >
-    <TriggerZoneEditor
-      :settings="settings"
-      :eventBus="eventBus"
-      :playerDimensions="playerDimensions"
-    >
-    </TriggerZoneEditor>
-  </div>
-</template>
-
-<script>
-import PlayerUIWindow from './src/PlayerUIWindow.vue';
-import GhettoContextMenu from './src/components/GhettoContextMenu.vue';
-import GhettoContextMenuItem from './src/components/GhettoContextMenuItem.vue';
-import GhettoContextMenuOption from './src/components/GhettoContextMenuOption.vue';
-import AlignmentOptionsControlComponent from './src/PlayerUiPanels/AlignmentOptionsControlComponent.vue';
-import BrowserDetect from '../ext/conf/BrowserDetect';
-import Logger from '../ext/lib/Logger';
-import Settings from '../ext/lib/Settings';
-import EventBus from '../ext/lib/EventBus';
-import UIProbeMixin from './src/utils/UIProbeMixin';
-import KeyboardShortcutParserMixin from './src/utils/KeyboardShortcutParserMixin';
-import CommsMixin from './src/utils/CommsMixin';
-import SupportLevelIndicator from './src/components/SupportLevelIndicator.vue';
-import TriggerZoneEditor from './src/components/TriggerZoneEditor.vue';
-
-export default {
-  components: {
-    PlayerUIWindow,
-    GhettoContextMenu,
-    GhettoContextMenuItem,
-    GhettoContextMenuOption,
-    AlignmentOptionsControlComponent,
-    SupportLevelIndicator,
-    TriggerZoneEditor,
-  },
-  mixins: [
-    UIProbeMixin,
-    KeyboardShortcutParserMixin,
-    CommsMixin
-  ],
-  data() {
-    return {
-      uwTriggerZoneVisible: false,
-      uwTriggerZoneTimeout: undefined,
-      uwTriggerRegionConf: {
-        left: "10%",
-        top: "10%",
-        height: "30%",
-        width: "30%",
-        maxWidth: "24rem",
-        maxHeight: "13.37rem",
-      },
-
-      uwWindowFadeOutDisabled: false,
-      uwWindowFadeOut: false,
-      uwWindowCloseTimeout: undefined,
-      uwWindowVisible: false,
-      triggerZoneEditorVisible: false,
-
-      // component properties
-      settings: {},
-      BrowserDetect: BrowserDetect,
-      settingsInitialized: false,
-      eventBus: new EventBus(),
-      logger: null,
-
-      // NOTE: chromium doesn't allow us to access window.parent.location
-      // meaning we will have to correct this value from our uwui-probe
-      // messages ... which is a bummer.
-      site: null,
-      origin: '*', // will be set appropriately once the first uwui-probe event is received
-      lastProbeTs: null,
-
-      isGlobal: true,
-      disabled: false,
-
-      contextMenuActive: false,
-      triggerZoneActive: false,
-
-      uiVisible: true,
-      debugData: {
-        resizer: {},
-        player: {},
-      },
-      debugDataPrettified: '',
-
-      // in global overlay, this property is used to determine
-      // if closing the window should emit uw-set-ui-state
-      // event on eventBus
-      showPlayerUIAfterClose: false,
-
-      statusFlags: {
-        hasDrm: undefined,
-        aardErrors: undefined,
-      },
-      defaultWindowTab: 'videoSettings',
-
-      saveState: {},
-      siteSettings: undefined,
-      previewZoneVisible: false,
-    };
-  },
-  computed: {
-    // LPT: NO ARROW FUNCTIONS IN COMPUTED,
-    // IS SUPER HARAM
-    // THINGS WILL NOT WORK IF YOU USE ARROWS
-    windowWidth() {
-      return window.innerWidth;
-    },
-    windowHeight() {
-      return window.innerHeight;
-    },
-    // LPT: NO ARROW FUNCTIONS IN COMPUTED,
-    // IS SUPER HARAM
-    // THINGS WILL NOT WORK IF YOU USE ARROWS
-    siteSupportLevel() {
-      return (this.site && this.siteSettings) ? this.siteSettings.data.type || 'no-support' : 'waiting';
-    }
-  },
-  watch: {
-    showUi(visible) {
-      if (visible !== undefined) {
-        this.uiVisible = visible;
-      }
-    },
-    resizerDebugData(newData) {
-      this.debugData.resizer = newData;
-      this.debugDataPrettified = JSON.stringify(this.debugData, null, 2);
-    },
-    playerDebugData(newData) {
-      this.debugData.player = newData;
-      this.debugDataPrettified = JSON.stringify(this.debugData, null, 2);
-    }
-  },
-
-  async created() {
-    this.logger = new Logger();
-
-    // this prolly needs to be taken out
-    await this.logger.init({
-        allowLogging: true,
-    });
-
-    this.settings = new Settings({afterSettingsSaved: this.updateConfig, logger: this.logger});
-    this.settings.listenAfterChange(() => this.updateTriggerZones());
-
-    await this.settings.init();
-    this.settingsInitialized = true;
-
-    // set up communication with client script.
-    // NOTE: companion onmousemove is set up in UIProbeMixin
-    window.addEventListener('message', event => {
-      this.handleMessage(event);
-    });
-
-    this.eventBus.subscribe('uw-config-broadcast', {function: (data) => {
-      switch (data.type) {
-        case 'drm-status':
-          this.statusFlags.hasDrm = data.hasDrm;
-          break;
-        case 'aard-error':
-          this.statusFlags.aardErrors = data.aardErrors;
-          break;
-        case 'player-dimensions':
-          this.playerDimensionsUpdate(data.data);
-          break;
-      }
-    }});
-
-    this.eventBus.subscribe('uw-set-ui-state', { function: (data) => {
-      if (data.globalUiVisible !== undefined) {
-        if (this.isGlobal) {
-          if (data.globalUiVisible) {
-            this.showUwWindow();
-          } else {
-            this.hideUwWindow(true);
-          }
-          // this.showPlayerUIAfterClose = data.showPlayerUIAfterClose;
-        } else {
-          // non global UIs are hidden while global overlay
-          // is visible and vice versa
-          // this.disabled = data.globalUiVisible;
-          this.saveState = {
-            uwWindowVisible: this.uwWindowVisible,
-            uwWindowFadeOutDisabled: this.uwWindowFadeOutDisabled,
-            uwWindowFadeOut: this.uwWindowFadeOut
-          };
-          this.uwWindowFadeOutDisabled = false;
-          this.hideUwWindow(true);
-        }
-      }
-    }});
-
-    this.eventBus.subscribe(
-      'uw-restore-ui-state',
-      {
-        function: (data) => {
-          if (this.saveState) {
-            if (this.saveState.uwWindowVisible) {
-              this.showUwWindow();
-            }
-            this.uwWindowFadeOutDisabled = this.saveState.uwWindowFadeOutDisabled;
-            this.uwWindowFadeOut = this.saveState.uwWindowFadeOut;
-          }
-          this.saveState = {};
-        }
-      }
-    );
-
-    this.eventBus.subscribe('ui-trigger-zone-update', {
-      function: (data) => {
-        this.showTriggerZonePreview = data.previewZoneVisible;
-        // this.;
-      }
-    });
-
-    this.eventBus.subscribe(
-      'start-trigger-zone-edit',
-      {
-        function: () => {
-          this.triggerZoneEditorVisible = true;
-          this.uwWindowVisible = false;
-        }
-      }
-    );
-
-     this.eventBus.subscribe(
-      'finish-trigger-zone-edit',
-      {
-        function: () => {
-          this.triggerZoneEditorVisible = false;
-          this.showUwWindow('playerUiSettings');
-        }
-      }
-    );
-
-    this.sendToParentLowLevel('uwui-get-role', null);
-    this.sendToParentLowLevel('uwui-get-theme', null);
-
-    this.sendToParentLowLevel('uw-bus-tunnel', {
-      action: 'get-player-dimensions'
-    });
-  },
-
-  methods: {
-    /**
-     * Gets URL of the browser settings page (i think?)
-     */
-    getUrl(url) {
-      return BrowserDetect.getURL(url);
-    },
-
-    /**
-     * Mostly intended to process messages received via window.addEventListener('message').
-     * This method should include minimal logic — instead, it should only route messages
-     * to the correct function down the line.
-     */
-    handleMessage(event) {
-      switch (event.data.action) {
-        case 'uwui-probe':
-          if (!this.site) {
-            this.origin = event.origin;
-            this.site = event.origin.split('//')[1];
-            this.siteSettings = this.settings.getSiteSettings(this.site);
-          }
-          return this.handleProbe(event.data, event.origin); // handleProbe is defined in UIProbeMixin
-        case 'uw-bus-tunnel':
-          return this.handleBusTunnelIn(event.data.payload);
-        case 'uwui-set-role':
-          this.isGlobal = event.data.payload.role === 'global';
-          this.sendToParentLowLevel('uwui-interface-ready', true);
-          break;
-      }
-    },
-
-    /**
-     * Handles trigger zone
-     */
-    handleTriggerZone(mouseInside) {
-      // this.triggerZoneActive = mouseInside;
-    },
-
-    acknowledgeNewFeature(featureKey) {
-      delete this.settings.active.newFeatureTracker[featureKey];
-      this.settings.saveWithoutReload();
-    },
-    newFeatureViewUpdate(featureKey) {
-      if (!this.settings.active.newFeatureTracker[featureKey]) {
-        return;
-      }
-      try {
-        this.settings.active.newFeatureTracker[featureKey].show--;
-        this.settings.saveWithoutReload();
-
-        if (this.settings.active.newFeatureTracker[featureKey]?.show < 0) {
-          this.acknowledgeNewFeature(featureKey);
-        }
-      } catch (e) {
-        // do nothing
-      }
-    },
-
-    /**
-     * Sends message to parent _without_ using event bus.
-     */
-    sendToParentLowLevel(action, payload, lowLevelExtras = {}) {
-      window.parent.postMessage(
-        {
-          action, payload, ...lowLevelExtras
-        },
-        '*'
-      );
-    },
-
-    preventContextMenuHide() {
-      this.contextMenuActive = true;
-    },
-    allowContextMenuHide() {
-      this.contextMenuActive = false;
-    },
-
-    setTriggerZoneActive(active, event) {
-      this.triggerZoneActive = active;
-    },
-
-    showUwWindow(tab) {
-      this.defaultWindowTab = tab; // can be undefined
-
-      this.uwWindowFadeOut = false;
-      this.uwWindowVisible = true;
-      this.uwTriggerZoneVisible = false;
-      this.allowContextMenuHide();
-
-      // refresh DRM status
-      this.eventBus.send('get-drm-status');
-
-      // if (this.isGlobal) {
-      //   this.sendToParentLowLevel('uwui-clickable', undefined, {clickable: true});
-      // }
-    },
-
-    hideUwWindow(skipTimeout = false) {
-      if (this.uwWindowFadeOutDisabled) {
-        return;
-      }
-
-      const timeout = skipTimeout ? 0 : 1100;
-
-      this.uwWindowCloseTimeout = setTimeout(
-        () => {
-          this.uwWindowVisible = false;
-
-          // Global UI has some extra housekeeping to do when window gets hidden
-          if (this.isGlobal) {
-            this.sendToParentLowLevel('uwui-global-window-hidden', {});
-          }
-        },
-        timeout
-      );
-      this.uwWindowFadeOut = true;
-    },
-
-    cancelUwWindowHide() {
-      this.uwWindowFadeOut = false;
-      clearTimeout(this.uwWindowCloseTimeout);
-    },
-
-    handleBusTunnelIn(payload) {
-      this.eventBus.send(payload.action, payload.config, payload.routingData);
-    }
-  }
-}
-</script>
-<style lang="scss">
-.ard-blocked {
-  color: rgb(219, 125, 48) !important;
-  background-color: rgba(0,0,0,0.85) !important;
-}
-</style>
-
-<style lang="scss" src="./src/res-common/panels.scss" scoped module></style>
-<style lang="scss" src="./src/res-common/common.scss" scoped module></style>
-
-<style lang="scss" scoped>
-
-.uw-hover {
-  position: absolute;
-  z-index: 999999999999999999;
-}
-
-.reduced-padding {
-  padding: 1rem !important;
-}
-
-.uv-hover-trigger-region {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-
-  border: 0.5rem dashed #fff;
-  color: #fff;
-  backdrop-filter: blur(0.5rem) brightness(0.5);
-}
-
-.uw-window {
-  position: fixed;
-
-  top: 10%;
-  left: 10%;
-
-  z-index: 999999999999999999;
-
-  width: 2500px;
-  height: 1200px;
-  max-width: 80%;
-  max-height: 80%;
-
-  pointer-events: all !important;
-
-  opacity: 1;
-  backdrop-filter: blur(16px) saturate(120%);
-
-  &.fade-out {
-    opacity: 0;
-    transition: opacity 0.5s;
-    transition-delay: 0.5s;
-  }
-}
-
-.gib-bg {
-  background-color: rgba(0, 0, 0, 0.5);
-  backdrop-filter: blur(16px) saturate(120%);
-
-  width: fit-content;
-  block-size: fit-content;
-}
-
-
-.context-spawn {
-  position: absolute;
-  top: 0;
-  left: 0;
-
-  width: 100dvw;
-  height: 100dvh;
-
-  box-sizing: border-box;
-  overflow: hidden;
-
-  display: flex;
-  flex-direction: row;
-  align-content: center;
-  align-items: center;
-  // width: 100%;
-  // height: 100%;
-
-  color: #fff;
-
-  // .context-item {
-  //   font-size: .95rem;
-  //   padding: 1rem 1.6rem;
-  //   background-color: rgba(0, 0, 0, 0.5);
-  //   backdrop-filter: blur(16px) saturate(120%);
-
-  //   white-space: nowrap;
-  // }
-
-  // .spawn-container {
-    // border: 1px solid white;
-  // }
-}
-
-.extension-status-messages {
-  z-index: 1000;
-  text-transform: uppercase;
-  display: flex;
-  flex-direction: column;
-  text-align: center;
-
-  width: 112.25%;
-  transform: translate(-12.5%, 12.5%) scale(0.75);
-
-  > * {
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
-  }
-}
-
-.flex-reverse-order {
-  display: flex;
-  flex-direction: column-reverse;
-
-}
-
-.aard-blocked {
-  color: #fa6;
-}
-
-.trigger-zone-preview {
-  border: 4px solid #fa4;
-}
-
-.debug-1 {
-  border: 1px solid yellow;
-
-  &:hover {
-    background-color: rbba(255,255,0,0.5);
-  }
-}
-.debug-2 {
-  border: 1px solid blue;
-
-  &:hover {
-    background-color: rbba(0,0,255,.5);
-  }
-}
-</style>

src/csui/Popup.vue

@@ -1,535 +0,0 @@
-<template>
-  <div class="popup-panel">
-    <!--
-      NOTE — the code that makes ultrawidify popup work in firefox regardless of whether the
-      extension is being displayed in a normal or a small/overflow popup breaks the popup
-      behaviour on Chrome (where the popup would never reach the full width of 800px)
-
-      Since I'm tired and the hour is getting late, we'll just add an extra CSS class for
-      non-firefox builds of this extension and be done with it. No need to complicate things
-      further than that.
-    -->
-    <div v-if="settingsInitialized"
-        class="popup flex flex-col no-overflow"
-        :class="{'popup-chrome': ! BrowserDetect?.firefox}"
-    >
-      <div class="flex-row flex-nogrow flex-noshrink relative header"
-      >
-        <div class="grow shrink">
-          <h1>
-            <span class="smallcaps">Ultrawidify</span>: <small>Quick settings</small>
-          </h1>
-        </div>
-        <div v-if="BrowserDetect?.processEnvChannel !== 'stable'" class="absolute channel-info version-info">
-          Build channel: {{BrowserDetect?.processEnvChannel}} <br/>
-          <label>Version:</label> <br/>
-          {{ settings.getExtensionVersion() }}
-        </div>
-        <div v-else class="version-info">
-          <label>Version:</label> <br/>
-          {{ settings.getExtensionVersion() }}
-        </div>
-      </div>
-
-
-      <!-- CONTAINER ROOT -->
-      <div class="flex flex-row body no-overflow flex-grow">
-
-        <!-- TABS -->
-        <div class="flex flex-col tab-row" style="flex: 3 3; border-right: 1px solid #222;">
-          <div
-            v-for="tab of tabs"
-            :key="tab.id"
-            class="tab flex flex-row"
-            :class="{'active': tab.id === selectedTab}"
-            @click="selectTab(tab.id)"
-          >
-            <div class="icon-container">
-              <mdicon
-                :name="tab.icon"
-                :size="32"
-              />
-            </div>
-            <div class="label">
-              {{tab.label}}
-            </div>
-          </div>
-        </div>
-
-        <!-- CONTENT -->
-        <div class="scrollable" style="flex: 7 7; padding: 1rem;">
-          <template v-if="settings && siteSettings">
-            <InPlayerUIAdvertisement
-              v-if="selectedTab === 'playerUiCtl'"
-              :eventBus="eventBus"
-            />
-            <PopupVideoSettings
-              v-if="selectedTab === 'videoSettings'"
-              :settings="settings"
-              :eventBus="eventBus"
-              :siteSettings="siteSettings"
-            ></PopupVideoSettings>
-            <!-- <PlayerDetectionPanel
-              v-if="selectedTab === 'playerDetection'"
-              :settings="settings"
-              :eventBus="eventBus"
-              :siteSettings="siteSettings"
-              :site="site.host"
-            >
-            </PlayerDetectionPanel> -->
-            <BaseExtensionSettings
-              v-if="selectedTab === 'extensionSettings'"
-              :settings="settings"
-              :eventBus="eventBus"
-              :siteSettings="siteSettings"
-              :site="site.host"
-            >
-            </BaseExtensionSettings>
-          </template>
-          <template v-else>No settings or site settings found.</template>
-        </div>
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import BaseExtensionSettings from './src/PlayerUiPanels/BaseExtensionSettings.vue'
-import PlayerDetectionPanel from './src/PlayerUiPanels/PlayerDetectionPanel.vue'
-import PopupVideoSettings from './src/popup/panels/PopupVideoSettings.vue'
-import InPlayerUIAdvertisement from './src/PlayerUiPanels/InPlayerUiAdvertisement.vue';
-import Debug from '../ext/conf/Debug';
-import BrowserDetect from '../ext/conf/BrowserDetect';
-import Comms from '../ext/lib/comms/Comms';
-import CommsClient, {CommsOrigin} from '../ext/lib/comms/CommsClient';
-import Settings from '../ext/lib/Settings';
-import Logger from '../ext/lib/Logger';
-import EventBus from '../ext/lib/EventBus';
-import {ChromeShittinessMitigations as CSM} from '../common/js/ChromeShittinessMitigations';
-
-export default {
-  data () {
-    return {
-      comms: undefined,
-      eventBus: new EventBus(),
-      settings: {},
-      settingsInitialized: false,
-      narrowPopup: null,
-      sideMenuVisible: null,
-      logger: undefined,
-      site: undefined,
-      siteSettings: undefined,
-      selectedTab: 'playerUiCtl',
-      tabs: [
-        // see this for icons: https://pictogrammers.com/library/mdi/
-        {id: 'playerUiCtl', label: 'In-player UI', icon: 'artboard'},
-        {id: 'videoSettings', label: 'Video settings', icon: 'crop'},
-        // {id: 'playerDetection', label: 'Player detection', icon: 'television-play'},
-        {id: 'extensionSettings', label: 'Site and Extension options', icon: 'cogs' },
-      ],
-    }
-  },
-  async created() {
-    this.logger = new Logger();
-    await this.logger.init({
-        allowLogging: true,
-    });
-
-    this.settings = new Settings({afterSettingsSaved: () => this.updateConfig(), logger: this.logger});
-    await this.settings.init();
-    this.settingsInitialized = true;
-
-    // const port = chrome.runtime.connect({name: 'popup-port'});
-    // port.onMessage.addListener( (m,p) => this.processReceivedMessage(m,p));
-    // CSM.setProperty('port', port);
-
-    this.eventBus = new EventBus();
-    this.eventBus.subscribe(
-      'set-current-site',
-      {
-        function: (config, context) => {
-          if (this.site) {
-            if (!this.site.host) {
-              // dunno why this fix is needed, but sometimes it is
-              this.site.host = config.site.host;
-            }
-          }
-          this.site = config.site;
-          // this.selectedSite = this.selectedSite || config.site.host;
-          this.siteSettings = this.settings.getSiteSettings(this.site.host);
-
-          this.eventBus.setupPopupTunnelWorkaround({
-            origin: CommsOrigin.Popup,
-            comms: {
-              forwardTo: 'active'
-            }
-          });
-
-          this.loadFrames(this.site);
-
-        }
-      }
-    );
-
-    this.comms = new CommsClient('popup-port', this.logger, this.eventBus);
-    this.eventBus.setComms(this.comms);
-    this.eventBus.setupPopupTunnelWorkaround({
-      origin: CommsOrigin.Popup,
-      comms: {forwardTo: 'active'}
-    });
-
-
-    // ensure we'll clean player markings on popup close
-    window.addEventListener("unload", () => {
-      CSM.port.postMessage({
-        cmd: 'unmark-player',
-        forwardToAll: true,
-      });
-      // if (BrowserDetect.anyChromium) {
-      //   chrome.extension.getBackgroundPage().sendUnmarkPlayer({
-      //     cmd: 'unmark-player',
-      //     forwardToAll: true,
-      //   });
-      // }
-    });
-
-    // get info about current site from background script
-    while (true) {
-      this.requestSite();
-      await this.sleep(5000);
-    }
-  },
-  async updated() {
-    const body = document.getElementsByTagName('body')[0];
-
-    // ensure that narrowPopup only gets set the first time the popup renders
-    // if popup was rendered before, we don't do anything because otherwise
-    // we'll be causing an unwanted re-render
-    //
-    // another thing worth noting — the popup gets first initialized with
-    // offsetWidth set to 0. This means proper popup will be displayed as a
-    // mini popup if we don't check for that.
-    if (this.narrowPopup === null && body.offsetWidth > 0) {
-      this.narrowPopup = body.offsetWidth < 600;
-    }
-  },
-  components: {
-    Debug,
-    BrowserDetect,
-    PopupVideoSettings, PlayerDetectionPanel, BaseExtensionSettings, InPlayerUIAdvertisement
-  },
-  methods: {
-    async sleep(t) {
-      return new Promise( (resolve,reject) => {
-        setTimeout(() => resolve(), t);
-      });
-    },
-    toObject(obj) {
-      return JSON.parse(JSON.stringify(obj));
-    },
-    requestSite() {
-      try {
-        this.logger.log('info','popup', '[popup::getSite] Requesting current site ...')
-        // CSM.port.postMessage({command: 'get-current-site'});
-        this.eventBus.send(
-          'get-current-site',
-          {
-            comms: {forwardTo: 'active'}
-          }
-        );
-      } catch (e) {
-        this.logger.log('error','popup','[popup::getSite] sending get-current-site failed for some reason. Reason:', e);
-      }
-    },
-    getRandomColor() {
-      return `rgb(${Math.floor(Math.random() * 128)}, ${Math.floor(Math.random() * 128)}, ${Math.floor(Math.random() * 128)})`;
-    },
-    selectTab(tab) {
-      this.selectedTab = tab;
-    },
-    processReceivedMessage(message, port) {
-      this.logger.log('info', 'popup', '[popup::processReceivedMessage] received message:', message)
-
-      if (message.command === 'set-current-site'){
-        if (this.site) {
-          if (!this.site.host) {
-            // dunno why this fix is needed, but sometimes it is
-            this.site.host = site.tabHostname;
-          }
-        }
-        this.site = message.site;
-
-        // update activeSites
-        // this.activeSites = this.activeSites.filter(x => x.host !== message.site);
-
-        // add current site
-        // this.activeSites = unshift({
-        //   host: message.site.host,
-        //   isIFrame: false,  // currently unused
-        // });
-        this.selectedSite = this.selectedSite || message.site.host;
-
-        this.loadFrames(this.site);
-      }
-
-      return true;
-    },
-
-    isDefaultFrame(frameId) {
-      return frameId === '__playing' || frameId === '__all';
-    },
-    loadFrames() {
-      this.activeSites = [{
-        host: this.site.host,
-        isIFrame: false,  // not used tho. Maybe one day
-      }];
-      this.selectedSite = this.selectedSite || this.site.host;
-
-      // for (const frame in videoTab.frames) {
-      //   this.activeFrames.push({
-      //     id: `${this.site.id}-${frame}`,
-      //     label: videoTab.frames[frame].host,
-      //     ...this.frameStore[frame],
-      //   })
-
-      //   // only add each host once at most
-      //   if (!this.activeSites.find(x => x.host === videoTab.frames[frame].host)) {
-      //     this.activeSites.push({
-      //       host: videoTab.frames[frame].host,
-      //       isIFrame: undefined // maybe one day
-      //     });
-      //   }
-      // }
-
-      // update whether video tab can be shown
-      // this.updateCanShowVideoTab();
-    },
-    getRandomColor() {
-      return `rgb(${Math.floor(Math.random() * 128)}, ${Math.floor(Math.random() * 128)}, ${Math.floor(Math.random() * 128)})`;
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-// @import 'res/css/uwui-base.scss';
-@import 'res/css/colors.scss';
-@import 'res/css/font/overpass.css';
-@import 'res/css/font/overpass-mono.css';
-@import 'res/css/common.scss';
-@import './src/res-common/_variables';
-
-.header {
-  background-color: rgb(90, 28, 13);
-  color: #fff;
-  padding: 8px;
-
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-
-
-  h1 {
-    font-size: 2rem;
-  }
-
-  .version-info {
-    text-align: right;
-    font-size: 0.8rem;
-    opacity: 0.8;
-    label {
-      opacity: 0.5;
-    }
-  }
-
-}
-
-.site-support-info {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-
-  .site-support-site {
-    font-size: 1.5em;
-  }
-
-  .site-support {
-    display: inline-flex;
-    flex-direction: row;
-    align-items: center;
-
-    margin-left: 1rem;
-    border-radius: 8px;
-    padding: 0rem 1.5rem 0rem 1rem;
-
-    position: relative;
-
-    .tooltip {
-      padding: 1rem;
-      display: none;
-      position: absolute;
-      bottom: 0;
-      transform: translateY(110%);
-      width: 42em;
-
-      background-color: rgba(0,0,0,0.90);
-      color: #ccc;
-    }
-    &:hover {
-      .tooltip {
-        display: block;
-      }
-    }
-
-    .mdi {
-      margin-right: 1rem;
-    }
-
-    &.official {
-      background-color: #fa6;
-      color: #000;
-
-      .mdi {
-        fill: #000 !important;
-      }
-    }
-
-    &.community {
-      background-color: rgb(85, 85, 179);
-      color: #fff;
-
-      .mdi {
-        fill: #fff !important;
-      }
-    }
-
-    &.no-support {
-      background-color: rgb(138, 65, 126);
-      color: #eee;
-
-      .mdi {
-        fill: #eee !important;
-      }
-    }
-
-    &.user-added {
-      border: 1px solid #ff0;
-
-      color: #ff0;
-
-      .mdi {
-        fill: #ff0 !important;
-      }
-    }
-  }
-}
-
-.content {
-  flex-grow: 1;
-
-  .warning-area {
-    flex-grow: 0;
-    flex-shrink: 0;
-  }
-
-  .panel-content {
-    flex-grow: 1;
-    flex-shrink: 1;
-
-    overflow-y: auto;
-    padding: 1rem;
-  }
-}
-
-.warning-box {
-  background: rgb(255, 174, 107);
-  color: #000;
-  margin: 1rem;
-  padding: 1rem;
-
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-
-  .icon-container {
-    margin-right: 1rem;
-    flex-shrink: 0;
-    flex-grow: 0;
-  }
-
-  a {
-    color: rgba(0,0,0,0.7);
-    cursor: pointer;
-  }
-}
-
-
-.popup-panel {
-  background-color: rgba(0,0,0,0.50);
-  color: #fff;
-
-  overflow-y: auto;
-
-  .popup-window-header {
-    padding: 1rem;
-    background-color: rgba(5,5,5, 0.75);
-  }
-  .tab-row {
-    background-color: rgba(11,11,11, 0.75);
-
-    .tab {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-
-      padding: 1rem;
-      font-size: 1.25rem;
-      // height: rem;
-      min-height: 3rem;
-
-      border-bottom: 1px solid rgba(128, 128, 128, 0.5);
-      border-top: 1px solid rgba(128, 128, 128, 0.5);
-      opacity: 0.5;
-
-      &:hover {
-        opacity: 1;
-      }
-      &.active {
-        opacity: 1.0;
-        background-color: $primaryBg;
-        color: rgb(255, 174, 107);
-        border-bottom: 1px solid rgba(116, 78, 47, 0.5);
-        border-top: 1px solid rgba(116, 78, 47, 0.5);
-      }
-
-      .icon-container {
-        width: 64px;
-        flex-grow: 0;
-        flex-shrink: 0;
-      }
-      .label {
-        flex-grow: 1;
-        flex-shrink: 1;
-        padding: 0 !important;
-      }
-    }
-  }
-
-  .popup-title, .popup-title h1 {
-    font-size: 48px !important;
-  }
-}
-
-pre {
-  white-space: pre-wrap;
-}
-
-.button {
-  border: 1px solid #222 !important;
-}
-
-h1 {
-  margin: 0; padding: 0; font-weight: 400; font-size:24px;
-}
-</style>

src/csui/csui-global.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"; style="position: relative">
-<head>
-  <meta charset="UTF-8">
-  <meta name="color-scheme" content="light dark">
-  <title>Ultrawidify - Content Script User Interface (global overlay)</title>
-  <!-- <link rel="stylesheet" href="csui.css"> -->
-  <% if (NODE_ENV === 'development') { %>
-  <!-- Load some resources only in development environment -->
-  <% } %>
-</head>
-<body class="uw-ultrawidify-container-root">
-  <div id="app"></div>
-  <script src="csui-global.js"></script>
-</body>
-</html>

src/csui/csui-global.js

@@ -1,11 +0,0 @@
-import { createApp } from 'vue';
-import GlobalFrame from './GlobalFrame';
-import mdiVue from 'mdi-vue/v3';
-import * as mdijs from '@mdi/js';
-
-// NOTE — this is in-player interface for ultrawidify
-// it is injected into the page in UI.init()
-
-createApp(GlobalFrame)
-  .use(mdiVue, {icons: mdijs})
-  .mount('#app');

src/csui/csui-overlay-dark.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" style="position: relative">
-<head>
-  <meta charset="UTF-8">
-  <meta name="color-scheme" content="dark">
-  <title>Ultrawidify - Content Script User Interface (in-player overlay)</title>
-  <!-- <link rel="stylesheet" href="csui.css"> -->
-</head>
-<body class="uw-ultrawidify-container-root" style="background-color: transparent;">
-  <div id="app"></div>
-  <script src="csui.js"></script>
-</body>
-</html>

src/csui/csui-overlay-light.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" style="position: relative">
-<head>
-  <meta charset="UTF-8">
-  <meta name="color-scheme" content="light">
-  <title>Ultrawidify - Content Script User Interface (in-player overlay)</title>
-  <!-- <link rel="stylesheet" href="csui.css"> -->
-</head>
-<body class="uw-ultrawidify-container-root" style="background-color: transparent;">
-  <div id="app"></div>
-  <script src="csui.js"></script>
-</body>
-</html>

src/csui/csui-overlay-normal.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" style="position: relative">
-<head>
-  <meta charset="UTF-8">
-  <title>Ultrawidify - Content Script User Interface (in-player overlay)</title>
-  <!-- <link rel="stylesheet" href="csui.css"> -->
-</head>
-<body class="uw-ultrawidify-container-root" style="background-color: transparent;">
-  <div id="app"></div>
-  <script src="csui.js"></script>
-</body>
-</html>

src/csui/csui-popup.js

@@ -1,8 +0,0 @@
-import { createApp } from 'vue'
-import Popup from './Popup';
-import mdiVue from 'mdi-vue/v3';
-import * as mdijs from '@mdi/js';
-
-createApp(Popup)
-  .use(mdiVue, {icons: mdijs})
-  .mount('#app');

src/csui/csui.js

@@ -1,11 +0,0 @@
-import { createApp } from 'vue';
-import PlayerOverlay from './PlayerOverlay';
-import mdiVue from 'mdi-vue/v3';
-import * as mdijs from '@mdi/js';
-
-// NOTE — this is in-player interface for ultrawidify
-// it is injected into the page in UI.init()
-
-createApp(PlayerOverlay)
-  .use(mdiVue, {icons: mdijs})
-  .mount('#app');

src/csui/res/css/uwui-base.scss

@@ -1,35 +0,0 @@
-@import 'flex.scss';
-@import 'colors.scss';
-@import 'common.scss';
-
-* {
-  font-family: 'Overpass';
-}
-
-.uw-ultrawidify-container-root {
-  // here's the defaults:
-  // all: initial;
-  // * {
-  //   all: unset;
-  // }
-
-  // here's things that we don't want as defaults
-  // (must come after the all: declaration, otherwise
-  // all: declaration overrides everything.)
-
-  // we put our UI _over_ site's player:
-  z-index: 999999;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  background-color: none transparent !important;
-
-  // Ensure we're display:block
-  display: block;
-
-  // we are click-through by default:
-  pointer-events: none;
-}
-

src/csui/src/PlayerUIWindow.vue

@@ -1,415 +0,0 @@
-<template>
-  <div
-    class="popup-panel flex flex-col uw-clickable h-full"
-  >
-    <div class="popup-window-header">
-      <div class="header-title">
-        <div class="popup-title">Ultrawidify <small>{{settings?.active?.version}} - {{BrowserDetect.processEnvChannel}}</small></div>
-        <div class="site-support-info flex flex-row">
-          <div class="site-support-site">{{site}}</div>
-          <SupportLevelIndicator
-            v-if="inPlayer"
-            :siteSupportLevel="siteSupportLevel"
-          >
-          </SupportLevelIndicator>
-        </div>
-      </div>
-      <div class="header-buttons">
-        <div
-          class="header-button close-button"
-          @click="$emit('close')"
-        >
-          <mdicon name="close" :size="36"></mdicon>
-        </div>
-        <!-- <a >{{preventClose ? 'allow auto-close' : 'prevent auto-close'}}</a> -->
-      </div>
-    </div>
-
-    <div class="tab-main flex flex-row">
-      <div class="tab-row flex flex-col grow-0 shrink-0">
-        <div
-          v-for="tab of tabs"
-          :key="tab.id"
-          class="tab"
-          :class="{
-            'active': tab.id === selectedTab,
-            'highlight-tab': tab.highlight,
-          }"
-          @click="selectTab(tab.id)"
-        >
-          <div class="icon-container">
-            <mdicon
-              v-if="tab.icon"
-              :name="tab.icon"
-              :size="32"
-            />
-          </div>
-          <div class="label">
-            {{tab.label}}
-          </div>
-        </div>
-      </div>
-      <div class="content flex flex-col">
-        <!-- autodetection warning -->
-
-        <div class="warning-area">
-          <div
-            v-if="statusFlags.hasDrm"
-            class="warning-box"
-          >
-            <div class="icon-container">
-              <mdicon name="alert" :size="32" />
-            </div>
-            <div>
-              This site is blocking automatic aspect ratio detection. You will have to adjust aspect ratio manually.<br/>
-              <a>Learn more ...</a>
-            </div>
-          </div>
-        </div>
-
-        <div class="flex flex-row panel-content">
-          <!-- Panel section -->
-          <!-- <VideoSettings
-            v-if="selectedTab === 'videoSettings'"
-            :settings="settings"
-            :siteSettings="siteSettings"
-            :eventBus="eventBus"
-            :site="site"
-          ></VideoSettings> -->
-          <PlayerDetectionPanel
-            v-if="selectedTab === 'playerDetection'"
-            :siteSettings="siteSettings"
-            :eventBus="eventBus"
-            :site="site"
-          >
-          </PlayerDetectionPanel>
-          <PlayerUiSettings
-            v-if="selectedTab === 'playerUiSettings'"
-            :settings="settings"
-            :eventBus="eventBus"
-          >
-          </PlayerUiSettings>
-          <BaseExtensionSettings
-            v-if="selectedTab === 'extensionSettings'"
-            :settings="settings"
-            :siteSettings="siteSettings"
-            :site="site"
-          ></BaseExtensionSettings>
-          <AutodetectionSettingsPanel
-            v-if="selectedTab === 'autodetectionSettings'"
-            :settings="settings"
-            :siteSettings="siteSettings"
-            :eventBus="eventBus"
-            :site="site"
-          >
-          </AutodetectionSettingsPanel>
-          <DebugPanel
-            v-if="selectedTab === 'debugging'"
-            :settings="settings"
-            :eventBus="eventBus"
-            :site="site"
-          ></DebugPanel>
-          <ChangelogPanel
-            v-if="selectedTab === 'changelog'"
-            :settings="settings"
-          ></ChangelogPanel>
-          <AboutPanel
-            v-if="selectedTab === 'about'"
-          >
-          </AboutPanel>
-          <!-- <ResetBackupPanel
-            v-if="selectedTab === 'resetBackup'"
-            :settings="settings"
-          >
-          </ResetBackupPanel> -->
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import DebugPanel from './PlayerUiPanels/DebugPanel.vue'
-import AutodetectionSettingsPanel from './PlayerUiPanels/AutodetectionSettingsPanel.vue'
-import BaseExtensionSettings from './PlayerUiPanels/BaseExtensionSettings.vue'
-import PlayerDetectionPanel from './PlayerUiPanels/PlayerDetectionPanel.vue'
-import VideoSettings from './PlayerUiPanels/VideoSettings.vue'
-import BrowserDetect from '../../ext/conf/BrowserDetect'
-import ChangelogPanel from './PlayerUiPanels/ChangelogPanel.vue'
-import AboutPanel from './PlayerUiPanels/AboutPanel.vue'
-import PlayerUiSettings from './PlayerUiPanels/PlayerUiSettings.vue'
-import ResetBackupPanel from './PlayerUiPanels/ResetBackupPanel.vue'
-
-import SupportLevelIndicator from './components/SupportLevelIndicator.vue'
-
-export default {
-  components: {
-    VideoSettings,
-    PlayerDetectionPanel,
-    BaseExtensionSettings,
-    AutodetectionSettingsPanel,
-    DebugPanel,
-    PlayerUiSettings,
-    ChangelogPanel,
-    AboutPanel,
-    SupportLevelIndicator,
-    ResetBackupPanel,
-  },
-  mixins: [],
-  data() {
-    return {
-      statusFlags: {
-        hasDrm: undefined,
-      },
-
-      tabs: [
-        // {id: 'videoSettings', label: 'Video settings', icon: 'crop'},
-        {id: 'extensionSettings', label: 'Site and Extension options', icon: 'cogs' },
-        {id: 'playerUiSettings', label: 'UI and keyboard', icon: 'movie-cog-outline' },
-        {id: 'playerDetection', label: 'Player detection', icon: 'television-play'},
-        {id: 'autodetectionSettings', label: 'Autodetection options', icon: 'auto-fix'},
-        // {id: 'advancedOptions', label: 'Advanced options', icon: 'cogs' },
-        // {id: 'debugging', label: 'Debugging', icon: 'bug-outline' }
-        {id: 'changelog', label: 'What\'s new', icon: 'alert-decagram' },
-        {id: 'about', label: 'About', icon: 'information-outline'},
-        // {id: 'resetBackup', label: 'Reset and backup', icon: 'file-restore-outline'},
-      ],
-      selectedTab: 'extensionSettings',
-      BrowserDetect: BrowserDetect,
-      preventClose: false,
-      siteSettings: null,
-    }
-  },
-  props: [
-    'settings',
-    'eventBus',
-    'logger',
-    'in-player',
-    'site',
-    'defaultTab'
-  ],
-  computed: {
-    // LPT: NO ARROW FUNCTIONS IN COMPUTED,
-    // IS SUPER HARAM
-    // THINGS WILL NOT WORK IF YOU USE ARROWS
-    siteSupportLevel() {
-      return (this.site && this.siteSettings) ? this.siteSettings.data.type || 'no-support' : 'waiting';
-    }
-  },
-  created() {
-    if (this.defaultTab) {
-      this.selectedTab = this.defaultTab;
-    }
-    this.siteSettings = this.settings.getSiteSettings(this.site);
-    this.tabs.find(x => x.id === 'changelog').highlight = !this.settings.active.whatsNewChecked;
-
-    this.eventBus.subscribe(
-      'uw-show-ui',
-      () => {
-        if (this.inPlayer) {
-          return; // show-ui is only intended for global overlay
-        }
-      }
-    )
-  },
-  methods: {
-    /**
-     * Gets URL of the browser settings page (i think?)
-     */
-    getUrl(url) {
-      return BrowserDetect.getURL(url);
-    },
-    selectTab(tab) {
-      this.selectedTab = tab;
-    },
-    setPreventClose(bool) {
-      this.preventClose = bool;
-      this.$emit('preventClose', bool);
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import '../res/css/uwui-base.scss';
-@import '../res/css/colors.scss';
-@import '../res/css/font/overpass.css';
-@import '../res/css/font/overpass-mono.css';
-@import '../res/css/common.scss';
-@import '../src/res-common/_variables';
-
-// .relative-wrapper {
-//   position: relative;
-//   width: 100%;
-//   height: 100%;
-// }
-
-.tab-row {
-  width: 22rem;
-  flex-grow: 0;
-  flex-shrink: 0;
-}
-
-.tab-main {
-  flex-grow: 1;
-  flex-shrink: 1;
-  overflow: hidden;
-}
-
-.content {
-  flex-grow: 1;
-
-  .warning-area {
-    flex-grow: 0;
-    flex-shrink: 0;
-  }
-
-  .panel-content {
-    flex-grow: 1;
-    flex-shrink: 1;
-
-    overflow-y: auto;
-    padding: 1rem;
-  }
-}
-
-.warning-box {
-  background: rgb(255, 174, 107);
-  color: #000;
-  margin: 1rem;
-  padding: 1rem;
-
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-
-  .icon-container {
-    margin-right: 1rem;
-    flex-shrink: 0;
-    flex-grow: 0;
-  }
-
-  a {
-    color: rgba(0,0,0,0.7);
-    cursor: pointer;
-  }
-}
-
-
-.site-support-info {
-  display: flex;
-  flex-direction: row;
-  align-items: bottom;
-
-  .site-support-site {
-    font-size: 1.5em;
-  }
-}
-
-.popup-panel {
-  background-color: rgba(0,0,0,0.50);
-  color: #fff;
-
-  overflow-y: auto;
-
-  .popup-window-header {
-    padding: 1rem;
-    background-color: rgba(5,5,5, 0.75);
-
-    display: flex;
-    flex-direction: row;
-
-    .header-title {
-      flex: 1 1;
-    }
-    .header-buttons {
-      flex: 0 0;
-      display: flex;
-      flex-direction: row;
-
-      .header-button {
-        cursor: pointer;
-        border-radius: 50%;
-        width: 48px;
-        height: 48px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        &.button-active {
-          background-color: #fa6;
-          color: #000;
-
-          &:hover {
-            color: #ccc;
-          }
-        }
-
-        &.close-button {
-          color: #f00;
-        }
-
-        &:hover {
-          color: #fa6;
-        }
-      }
-    }
-  }
-  .tab-row {
-    background-color: rgba(11,11,11, 0.75);
-
-    .tab {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-
-      padding: 2rem;
-      font-size: 1.5rem;
-      height: 4rem;
-
-      border-bottom: 1px solid rgba(128, 128, 128, 0.5);
-      border-top: 1px solid rgba(128, 128, 128, 0.5);
-      opacity: 0.5;
-
-      &:hover {
-        opacity: 1;
-      }
-      &.active {
-        opacity: 1.0;
-        background-color: $primaryBg;
-        color: rgb(255, 174, 107);
-        border-bottom: 1px solid rgba(116, 78, 47, 0.5);
-        border-top: 1px solid rgba(116, 78, 47, 0.5);
-      }
-
-      .icon-container {
-        width: 64px;
-        flex-grow: 0;
-        flex-shrink: 0;
-      }
-      .label {
-        flex-grow: 1;
-        flex-shrink: 1;
-        padding: 0 !important;
-      }
-
-      &.highlight-tab {
-        opacity: 0.9;
-        color: #eee;
-
-        // .label {
-        //   color: rgb(239, 192, 152);
-        // }
-      }
-    }
-  }
-
-  .popup-title, .popup-title h1 {
-    font-size: 48px !important;
-  }
-}
-
-pre {
-  white-space: pre-wrap;
-}
-
-
-</style>

src/csui/src/PlayerUiPanels/AboutPanel.vue

@@ -1,122 +0,0 @@
-<template>
-  <div class="flex flex-col w-full h-full gap-2">
-    <h1>About Ultrawidify</h1>
-    <p>
-      Ultrawidify version: <b>{{addonVersion}}</b><br>
-      Install source: <b>{{addonSource}}</b>
-    </p>
-
-    <div class="flex flex-row gap-2 bg-black">
-      <div class="w-[1/2]" style="width: 50%">
-        <h2>Report a problem</h2>
-        <p>
-          You may report <strike>undocumented features</strike> bugs using one of the following options (in order of preference):
-        </p>
-        <ul>
-          <li> <a target="_blank" href="https://github.com/tamius-han/ultrawidify/issues"><b>Github (preferred)</b></a><br/></li>
-          <li>Email: <a target="_blank" :href="mailtoLink">tamius.han@gmail.com</a></li>
-        </ul>
-        <p>
-          When reporting bugs, please include the following information:
-        </p>
-        <ul>
-          <li>Extension version</li>
-          <li>Which browser you're using¹</li>
-          <li>Which extension store you installed extension from (install source)²</li>
-          <li>Which site you're having the issue on (preferably link. For issues with autodetection, please also include a timestamp)</li>
-          <li>What do I need to do in order to make the issue happen</li>
-          <li>Please include a screenshot of the problem. It usually helps.</li>
-        </ul>
-        <p>
-          <small>
-            [1] If using anything other than Firefox, Chrome, or Edge, please check if issue also happens in Chrome or Edge. Bugs affecting Opera will only get fixed if they also affect Chrome, because <a target="_blank" href="https://stuff.tamius.net/sacred-texts/2024/06/08/why-im-boycotting-opera/">I'm salty</a>.<br/>
-            [2] It is recommended that users of Microsoft Edge install Ultrawidify from the Microsoft Edge Addons source
-          </small>
-        </p>
-      </div>
-
-      <div class="w-[1/2]" style="width: 50%">
-        <h2>Thank you monies</h2>
-        <p>
-          If you think I deserve money for the work I did up to this point, you can bankroll my caffeine addiction.
-        </p>
-        <p class="text-center">
-          <a class="donate" href="https://www.paypal.com/paypalme/tamius" target="_blank">Donate on Paypal</a>
-        </p>
-        <p>
-          I also have <a href="https://instagram.com/shaman_urkog" target="_blank">instagram with nerdy shit</a> <small>(mini painting + various fantasy events)</small>.
-        </p>
-      </div>
-    </div>
-
-  </div>
-</template>
-
-<script>
-import BrowserDetect from '../../../ext/conf/BrowserDetect';
-
-export default {
-  components: {
-    BrowserDetect,
- },
-  data() {
-    return {
-      // reminder — webextension-polyfill doesn't seem to work in vue!
-      addonVersion: BrowserDetect.firefox ? chrome.runtime.getManifest().version : chrome.runtime.getManifest().version,
-      addonSource: BrowserDetect.processEnvVersion,
-      mailtoLink: '',
-      redditLink: '',
-      showEasterEgg: false,
-    }
-  },
-  async created() {
-    const messageTemplate = encodeURIComponent(
-`Describe your issue in more detail. In case of misaligned videos, please provide screenshots. When reporting\
- issues with autodetection not detecting aspect ratio correctly, please provide a link with timestamp to the\
- problematic video at the time where the problem happens. You may delete this paragraph, as it's only a template.
-
-
-Extension info (AUTOGENERATED — DO NOT CHANGE OR REMOVE):
-* Build: ${BrowserDetect.processEnvBrowser}-${this.addonVersion}-stable
-
-Browser-related stuff (please ensure this section is correct):
-* User Agent string: ${window.navigator.userAgent}
-* vendor: ${window.navigator.vendor}
-* Operating system: ${window.navigator.platform}
-`
-      );
-    this.mailtoLink = `mailto:tamius.han@gmail.com?subject=%5BUltrawidify%5D%20ENTER%20SUMMARY%20OF%20YOUR%20ISSUE%20HERE&body=${messageTemplate}`;
-  },
-  methods: {
-  }
-}
-</script>
-<style lang="scss" scoped>
-.flex {
-  display: flex;
-}
-.flex-row {
-  flex-direction: row;
-}
-
-p, li {
-  font-size: 1rem;
-}
-small {
-  opacity: 0.5;
-  font-size: 0.8em;
-}
-a {
-  color: #fa6;
-}
-.text-center {
-  text-align: center;
-}
-.donate {
-  margin: 1rem;
-  padding: 0.5rem 1rem;
-  border-radius: 0.25rem;
-  background-color: #fa6;
-  color: #000;
-}
-</style>

src/csui/src/PlayerUiPanels/AlignmentOptionsControlComponent.vue

@@ -1,171 +0,0 @@
-<template>
-  <div class="alignment-box">
-    <div
-      class="col top left"
-      @click="align(VideoAlignment.Left, VideoAlignment.Top)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-    <div
-      class="col top center"
-      @click="align(VideoAlignment.Center, VideoAlignment.Top)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-    <div
-      class="col top right"
-      @click="align(VideoAlignment.Right, VideoAlignment.Top)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-    <div
-      class="col ycenter left"
-      @click="align(VideoAlignment.Left, VideoAlignment.Center)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-    <div
-      class="col ycenter center"
-      @click="align(VideoAlignment.Center, VideoAlignment.Center)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-    <div
-      class="col ycenter right"
-      @click="align(VideoAlignment.Right, VideoAlignment.Center)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-    <div
-      class="col bottom left"
-      @click="align(VideoAlignment.Left, VideoAlignment.Bottom)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-    <div
-      class="col bottom center"
-      @click="align(VideoAlignment.Center, VideoAlignment.Bottom)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-    <div
-      class="col bottom right"
-      @click="align(VideoAlignment.Right, VideoAlignment.Bottom)"
-    >
-      <div class="alignment-ui"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-import VideoAlignmentType from '../../../common/enums/VideoAlignmentType.enum';
-
-
-export default {
-  props: [
-    'eventBus'
-  ],
-  data() {
-    return {
-      VideoAlignment: VideoAlignmentType
-    }
-  },
-  methods: {
-    align(alignmentX, alignmentY) {
-      this.eventBus?.sendToTunnel('set-alignment', {x: alignmentX, y: alignmentY})
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped module>
-.alignment-box {
-  aspect-ratio: 1;
-  // width: 100%;
-  // min-width: 40px;
-  // max-width: 80px;
-
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 0.5rem;
-
-
-  .col {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    background-color: rgba(0,0,0,0.25);
-    cursor: pointer;
-
-    padding: 0.5rem;
-    width: 1.5rem;
-    height: 1.5rem;
-
-    border-bottom: 1px solid transparent;
-
-    .alignment-ui {
-
-      width: 50%;
-      height: 50%;
-
-      border-style: solid;
-      border-width: 0px;
-      border-color: #fff;
-    }
-
-    &:hover {
-      background-color: rgba(0,0,0,0.5);
-      border-bottom: 1px solid #fa6;
-
-      .alignment-ui {
-        border-color: #fa6 !important;
-      }
-
-      &.center.ycenter {
-        .alignment-ui {
-          background-color: #fa6;
-        }
-      }
-    }
-
-    &.top  {
-      align-items: flex-start;
-
-      .alignment-ui {
-        border-top-width: 3px;
-      }
-    }
-    &.bottom  {
-      align-items: flex-end;
-
-      .alignment-ui {
-        border-bottom-width: 3px;
-      }
-    }
-    &.left {
-      justify-content: flex-start;
-
-      .alignment-ui {
-        border-left-width: 3px;
-      }
-    }
-    &.right {
-      justify-content: flex-end;
-
-      .alignment-ui {
-        border-right-width: 3px;
-      }
-    }
-
-    &.center.ycenter {
-
-      .alignment-ui {
-        width: 25%;
-        height: 25%;
-        background-color: #fff;
-      }
-    }
-  }
-}
-</style>

src/csui/src/PlayerUiPanels/AutodetectionSettingsPanel.vue

@@ -1,478 +0,0 @@
-<template>
-  <div class="flex flex-col tab-root">
-    <div class="flex flex-row flex-wrap">
-
-      <!-- AARD performance metrics -->
-      <div class="sub-panel">
-        <div class="flex flex-row">
-          <h1><mdicon name="television-play" :size="32" /> Automatic Aspect Ratio Detection</h1>
-        </div>
-        <div class="sub-panel-content">
-          <p>
-            <b>Autodetection performance</b>
-          </p>
-          <p>
-            Automatic aspect ratio detection is a resource-hungry feature.
-            This page allows you to trade autodetection accuracy and/or frequency for
-            better performance.
-          </p>
-          <p>
-            Note that some browsers <a href="https://developer.mozilla.org/en-US/docs/Web/API/Performance/now" target="_blank">limit the accuracy of time measurements</a>, though once the bars go past the blue line those limitations are largely inconsequential.
-          </p>
-          <div class="performance-graph-container">
-            <div class="performance-graph">
-              <div class="time-budget hz144"></div>
-              <div class="time-budget hz120"></div>
-              <div class="time-budget hz60"></div>
-              <div class="time-budget hz30"></div>
-              <div class="time-budget hz24"></div>
-              <div class="time-budget rest"></div>
-
-              <div class="bar-container">
-                <div class="average-case">
-                  <div class="stats">
-                    <b>Average: </b>
-                    <span class="draw">draw (main) {{(performanceData?.imageDraw?.averageTime ?? 0).toFixed(1)}} ms</span> |
-                    <span class="draw-blackframe">blackframe {{(performanceData?.blackFrame?.averageTime ?? 0).toFixed(1)}} ms</span> |
-                    <span class="processing">
-                      processing {{
-                        Math.max(
-                          (performanceData?.total?.averageTime ?? 0)
-                            - (performanceData?.imageDraw?.averageTime ?? 0)
-                            - (performanceData?.blackFrame?.averageTime ?? 0),
-                          0
-                        ).toFixed(1)
-                      }} ms
-                    </span>
-                  </div>
-                  <div class="bar">
-                    <div
-                      class="draw"
-                      :style="{'width': (performanceData?.imageDraw?.averageTime ?? 0) + '%'}"
-                    >
-                    </div>
-                    <div
-                      class="draw-blackframe"
-                      :style="{'width': (performanceData?.blackFrame?.averageTime ?? 0) + '%'}"
-                    >
-                    </div>
-                    <div
-                      class="processing"
-                      :style="{
-                        'width': Math.max(
-                          (performanceData?.total?.averageTime ?? 0)
-                            - (performanceData?.imageDraw?.averageTime ?? 0)
-                            - (performanceData?.blackFrame?.averageTime ?? 0),
-                          0
-                        ) + '%'
-                      }"
-                    >
-                    </div>
-                  </div>
-                </div>
-                <div class="worst-case">
-                  <div class="stats">
-                    <b>Worst: </b>
-                    <span class="draw">draw (main) {{(performanceData?.imageDraw?.worstTime ?? 0).toFixed(1)}} ms</span> |
-                    <span class="draw-blackframe">blackframe {{(performanceData?.blackFrame?.worstTime ?? 0).toFixed(1)}} ms</span> |
-                    <span class="processing">
-                      processing {{
-                        Math.max(
-                          (performanceData?.total?.worstTime ?? 0)
-                            - (performanceData?.imageDraw?.worstTime ?? 0)
-                            - (performanceData?.blackFrame?.worstTime ?? 0),
-                          0
-                        ).toFixed(1)
-                      }} ms
-                    </span>
-                  </div>
-                  <div class="bar">
-                    <div
-                      class="draw"
-                      :style="{'width': (performanceData?.imageDraw?.worstTime ?? 0) + '%'}"
-                    >
-                    </div>
-                    <div
-                      class="draw-blackframe"
-                      :style="{'width': (performanceData?.blackFrame?.worstTime ?? 0) + '%'}"
-                    >
-                    </div>
-                    <div
-                      class="processing"
-                      :style="{
-                        'width': Math.max(
-                          (performanceData?.total?.worstTime ?? 0)
-                            - (performanceData?.imageDraw?.worstTime ?? 0)
-                            - (performanceData?.blackFrame?.worstTime ?? 0),
-                          0
-                        ) + '%'
-                      }"
-                    >
-                    </div>
-                  </div>
-                </div>
-
-                <div class="average-case">
-                  <div class="stats">
-                    <b>AR change (average): </b>
-                    <span class="draw">draw (main) {{(performanceData?.imageDraw?.averageTime ?? 0).toFixed(1)}} ms</span> |
-                    <span class="draw-blackframe">blackframe {{(performanceData?.blackFrame?.averageTime ?? 0).toFixed(1)}} ms</span> |
-                    <span class="processing">processing {{
-                      (
-                        (performanceData?.fastLetterbox?.averageTime ?? 0)
-                        + (performanceData?.edgeDetect?.averageTime ?? 0)
-                      ).toFixed(1)
-                      }} ms</span>
-                  </div>
-                  <div class="bar">
-                    <div
-                      class="draw"
-                      :style="{'width': (performanceData?.imageDraw?.averageTime ?? 0) + '%'}"
-                    >
-                    </div>
-                    <div
-                      class="draw-blackframe"
-                      :style="{'width': (performanceData?.blackFrame?.averageTime ?? 0) + '%'}"
-                    >
-                    </div>
-                    <div
-                      class="processing"
-                      :style="{
-                        'width': (
-                          (performanceData?.fastLetterbox?.averageTime ?? 0)
-                          + (performanceData?.edgeDetect?.averageTime ?? 0)
-                        ) + '%'
-                      }"
-                    >
-                    </div>
-                  </div>
-                </div>
-                <div class="worst-case">
-                  <div class="stats">
-                    <b>AR change (worst): </b>
-                    <span class="draw">draw (main) {{(performanceData?.imageDraw?.worstTime ?? 0).toFixed(1)}} ms</span> |
-                    <span class="draw-blackframe">blackframe {{(performanceData?.blackFrame?.worstTime ?? 0).toFixed(1)}} ms</span> |
-                    <span class="processing">processing {{
-                      (
-                        (performanceData?.fastLetterbox?.worstTime ?? 0)
-                        + (performanceData?.edgeDetect?.worstTime ?? 0)
-                      ).toFixed(1)
-                      }} ms</span>
-                  </div>
-                  <div class="bar">
-                    <div
-                      class="draw"
-                      :style="{'width': (performanceData?.imageDraw?.worstTime ?? 0) + '%'}"
-                    >
-                    </div>
-                    <div
-                      class="draw-blackframe"
-                      :style="{'width': (performanceData?.blackFrame?.worstTime ?? 0) + '%'}"
-                    >
-                    </div>
-                    <div
-                      class="processing"
-                      :style="{
-                        'width': (
-                          (performanceData?.fastLetterbox?.worstTime ?? 0)
-                          + (performanceData?.edgeDetect?.worstTime ?? 0)
-                        ) + '%'
-                      }"
-                    >
-                    </div>
-                  </div>
-                </div>
-              </div>
-
-            </div>
-          </div>
-          <div class="settings-segment">
-            <h2>Basic settings</h2>
-
-            <div class="option">
-              <div class="name">
-                Autodetection frequency
-              </div>
-              <div class="description">
-                Shorter intervals (left side of the slider) are more responsive to changes in aspect ratio detections,
-                but requires more system resources.
-              </div>
-              <div class="indent">
-                <div class="flex flex-row row-padding">
-                  <div class="flex flex-input">
-                    More often&nbsp;<small>(~60/s)</small>
-                    <input type="range"
-                          :value="Math.log(settings.active.arDetect.timers.playing)"
-                          @change="setArCheckFrequency($event.target.value)"
-                          min="2.3"
-                          max="9.3"
-                          step="any"
-                    />
-                    &nbsp; Less often&nbsp;<small>(~1/10s)</small>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <div class="option">
-              <div class="name">
-                Autodetection sensitivity
-              </div>
-              <div class="description">
-              </div>
-            </div>
-
-            <div class="field">
-              <div class="label">Maximum allowed vertical video misalignment:</div>
-              <div class="input">
-                <input v-model="settings.active.arDetect.allowedMisaligned" />
-              </div>
-              <div class="description">
-                Ultrawidify detects letterbox only if video is vertically centered. Some people are bad at vertically
-                centering the content, though. This is how off-center the video can be before autodetection will
-                refuse to crop it.
-              </div>
-            </div>
-
-            <div class="option">
-              <div class="name">Video sample size</div>
-              <div class="input">
-                <input v-model="settings.active.arDetect.canvasDimensions.sampleCanvas.width" /> x <input v-model="settings.active.arDetect.canvasDimensions.sampleCanvas.height" />
-              </div>
-            </div>
-
-            <div class="field">
-              <div class="label">Sample columns:</div>
-              <div class="input"><input v-model="settings.active.arDetect.sampling.staticCols" /></div>
-            </div>
-            <div class="field">
-              <div class="label">Sample rows:</div>
-              <div class="input"><input v-model="settings.active.arDetect.sampling.staticRows" /></div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Button from '../components/Button.vue'
-import KeyboardShortcutParser from '../../../common/js/KeyboardShortcutParser';
-import ShortcutButton from '../components/ShortcutButton';
-import EditShortcutButton from '../components/EditShortcutButton';
-import BrowserDetect from '../../../ext/conf/BrowserDetect';
-import AspectRatioType from '../../../common/enums/AspectRatioType.enum';
-import StretchType from '../../../common/enums/StretchType.enum';
-import CropModePersistence from '../../../common/enums/CropModePersistence.enum';
-import AlignmentOptionsControlComponent from './AlignmentOptionsControlComponent.vue';
-
-export default {
-  data() {
-    return {
-      exec: null,
-      performanceData: {},
-      graphRefreshInterval: undefined,
-    }
-  },
-  mixins: [
-  ],
-  props: [
-    'settings',
-    'frame',
-    'eventBus',
-    'site'
-  ],
-  created() {
-    this.eventBus.subscribe('uw-config-broadcast', {function: (config) => this.handleConfigBroadcast(config)});
-  },
-  mounted() {
-    this.eventBus.sendToTunnel('get-aard-timing');
-    this.graphRefreshInterval = setInterval(() => this.eventBus.sendToTunnel('get-aard-timing'), 500);
-  },
-  destroyed() {
-    clearInterval(this.graphRefreshInterval);
-  },
-  components: {
-    ShortcutButton,
-    EditShortcutButton,
-    Button,
-    AlignmentOptionsControlComponent
-  },
-  computed: {
-  },
-  methods: {
-    async openOptionsPage() {
-      BrowserDetect.runtime.openOptionsPage();
-    },
-    refreshGraph() {
-       this.eventBus.sendToTunnel('get-aard-timing');
-    },
-    handleConfigBroadcast(data) {
-      if (data.type === 'aard-performance-data') {
-        this.performanceData = data.performanceData;
-        this.$nextTick( () => this.$forceUpdate() );
-      }
-    },
-  }
-}
-</script>
-
-<style lang="scss" src="../../res/css/flex.scss" scoped module></style>
-<style lang="scss" src="../res-common/panels.scss" scoped module></style>
-<style lang="scss" src="../res-common/common.scss" scoped module></style>
-
-<style lang="scss" scoped module>
-@import '../res-common/variables';
-
-.performance-graph-container {
-  position: relative;
-
-  width: 100%;
-  height: 8rem;
-  padding: 1rem;
-
-  .performance-graph {
-    border: 1px solid #fa6;
-
-    position: absolute;
-    left: 0;
-    top: 0;
-
-    width: 100%;
-    height: 100%;
-
-    // graph is 100 ms wide
-    .time-budget {
-      height: 100%;
-      display: inline-block;
-      position: relative;
-
-      box-sizing: border-box;
-
-      z-index: 100;
-
-      &.hz144 {
-        width: 6.9%;
-        // background-color: rgba(143, 143, 235, 0.47);
-      }
-      &.hz120 {
-        width: 1.39%;
-        // background-color: rgba(108, 108, 211, 0.441);
-      }
-      &.hz60 {
-        width: 8.33%;
-        // background-color: rgba(78, 78, 182, 0.327);
-        border-right: 2px solid rgb(96, 96, 227);
-        &::after {
-          content: '60fps';
-          position: absolute;
-          top: 0;
-          right: -2px;
-
-          border-right: 2px solid rgb(96, 96, 227);
-
-          transform: translateY(-100%);
-
-          font-size: 0.6rem;
-          padding-right: 0.25rem;
-          text-transform: small-caps;
-        }
-      }
-      &.hz30 {
-        width: 16.67%;
-        // background-color: rgba(56, 56, 151, 0.308);
-        border-right: 2px solid #fb772a;
-
-        &::after {
-          content: '30fps';
-          position: absolute;
-          top: 0;
-          right: -2px;
-
-          border-right: 2px solid #fb772a;
-
-          transform: translateY(-100%);
-
-          font-size: 0.6rem;
-          padding-right: 0.25rem;
-          text-transform: small-caps;
-        }
-      }
-      &.hz24 {
-        width: 8.33%;
-        // background-color: rgba(37, 37, 118, 0.269);
-      }
-    }
-
-
-    .bar-container {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      padding-top: 0.5rem;
-      padding-bottom: 0.5rem;
-
-      > div {
-        height: 2.5rem;
-      }
-
-      .stats {
-        background-color: rgba(0, 0, 0, 0.544);
-        font-size: 0.75rem;
-        font-family: 'Overpass Mono';
-        z-index: 11010;
-
-        span {
-          font-size: 0.75rem;
-          z-index: 11011;
-
-          &::before {
-            content: '';
-            display: inline-block;
-            width: 0.75rem;
-            height: 0.75rem;
-            margin-top: 0.25rem;
-            margin-right: 0.5rem;
-          }
-
-          &.draw::before {
-            background-color: #fb772a;
-          }
-          &.draw-blackframe::before {
-            background-color: #e70c0c;
-          }
-          &.processing::before {
-            background-color: rgb(176, 167, 239);
-          }
-        }
-      }
-
-      .bar {
-        width: 100%;
-        height: 0.69rem;
-        background-color: #000;
-
-        overflow: hidden;
-        * {
-          display: inline-block;
-          height: 100%;
-        }
-
-        .draw {
-          background-color: #fb772a;
-        }
-        .draw-blackframe {
-          background-color: #e70c0c;
-        }
-        .processing {
-          background-color: rgb(176, 167, 239);
-        }
-      }
-    }
-  }
-}
-</style>

src/csui/src/PlayerUiPanels/BaseExtensionSettings.vue

@@ -1,124 +0,0 @@
-<template>
-  <div class="flex flex-col w-100">
-
-    <!-- TAB ROW -->
-    <div class="flex flex-row">
-      <div
-        class="tab"
-        :class="{'active': tab === 'siteSettings'}"
-        @click="setTab('siteSettings')"
-      >
-        Settings for current site<br/>
-        <small>{{ site }}</small>
-      </div>
-      <div
-        class="tab"
-        :class="{'active': tab === 'extensionSettings'}"
-        @click="setTab(tab = 'extensionSettings')"
-      >
-        Default settings for extension
-      </div>
-      <div
-        class="tab"
-        :class="{'active': tab === 'otherSites'}"
-        @click="setTab(tab = 'otherSites')"
-      >
-        Settings for other sites
-      </div>
-    </div>
-
-    <template v-if="tab === 'siteSettings' && siteSettings">
-      <!-- <div class="button">
-        Reset settings for site
-      </div> -->
-      <SiteExtensionSettings
-        v-if="settings"
-        :settings="settings"
-        :siteSettings="siteSettings"
-        :isDefaultConfiguration="false"
-      ></SiteExtensionSettings>
-    </template>
-
-    <template v-if="tab === 'extensionSettings' && globalSettings">
-      <SiteExtensionSettings
-        v-if="settings"
-        :settings="settings"
-        :siteSettings="globalSettings"
-        :isDefaultConfiguration="true"
-      ></SiteExtensionSettings>
-    </template>
-
-    <template v-if="tab === 'otherSites'">
-      <OtherSiteSettings
-        v-if="settings"
-        :settings="settings"
-      >
-      </OtherSiteSettings>
-    </template>
-
-
-
-    <!-- Reset options -->
-    <div class="flex flex-col" style="margin-top: 2rem">
-      <h2>Reset and backup</h2>
-      <p>
-        Pressing the button will reset settings to default without asking.
-      </p>
-      <button
-        class="danger"
-        @click="resetSettings"
-      >
-        Reset settings
-      </button>
-    </div>
-  </div>
-</template>
-
-<script>
-import SiteExtensionSettings from './PanelComponents/ExtensionSettings/SiteExtensionSettings.vue';
-import OtherSiteSettings from './PanelComponents/ExtensionSettings/OtherSiteSettings.vue';
-
-export default {
-  data() {
-    return {
-      tab: 'siteSettings'
-    }
-  },
-  mixins: [
-
-  ],
-  props: [
-    'settings',
-    'site',
-  ],
-  components: {
-    SiteExtensionSettings,
-    OtherSiteSettings
-},
-  computed: {
-    globalSettings() {
-      return this.settings?.getSiteSettings('@global') ?? null;
-    },
-    siteSettings() {
-      if (this.site) {
-        return  this.settings?.getSiteSettings(this.site) ?? null;
-      }
-      return null;
-    },
-    resetSettings() {
-      this.settings.active = JSON.parse(JSON.stringify(this.settings.default));
-      this.settings.saveWithoutReload();
-    }
-  },
-  methods: {
-    setTab(tab) {
-      this.tab = tab;
-    }
-  }
-
-}
-</script>
-
-<style lang="scss" src="../../res/css/flex.scss" scoped module></style>
-<style lang="scss" src="../res-common/panels.scss" scoped module></style>
-<style lang="scss" src="../res-common/common.scss" scoped module></style>

src/csui/src/PlayerUiPanels/ChangelogPanel.vue

@@ -1,127 +0,0 @@
-<template>
-  <div class="flex flex-col w-full h-full gap-2">
-    <div class="flex flex-row gap-2 bg-black">
-      <div class="w-[1/2]" style="width: 50%">
-        <h1>What's new</h1>
-        <p>Full changelog for older versions <a href="https://github.com/tamius-han/ultrawidify/blob/master/CHANGELOG.md" target="_blank">is available here</a>.</p>
-
-        <h2>6.2.0</h2>
-        <p>
-          There's been another major change that skips a version.
-        </p>
-        <ul>
-          <li>Parts of automatic aspect ratio detection use WebGL now. This should result in improved performance. Slightly underwhelming blog post about this issue can be found <a href="https://stuff.tamius.net/sacred-texts/2024/10/02/hot-dang-i-shouldnt-have-given-on-webgl/" target="_blank">here</a>.</li>
-          <li>In-player UI now indicates whether a site is having a problem with automatic aspect ratio detection.</li>
-          <li>UI improvements</li>
-        </ul>
-        <p>
-          Since automatic aspect ratio detection had to be rewritten completely and since the new version needs to be out 5 days ago, there are some regressions in the automatic aspect ratio detection.
-        </p>
-
-        <h2>6.0.1</h2>
-        <p>Fixed external links.</p>
-
-        <h2>6.0.0</h2>
-        <p>
-          I don't think I need to write a changelog for this one. I've also been working on this, on and (mostly) off, for ... a long time, so I might have "kinda forgot" some minor things.
-        </p>
-        <ul>
-          <li><b>Manifest v3</b>. Bit late, but still.</li>
-          <li>
-            <b>In-player UI.</b><br/>
-            This one took major effort to pull off. Required some changes under the hood, required me to de-spaghettify some code. The UI will only show
-            if the video takes up sufficient amount of space (currently determined as 960 pixels wide).
-          </li>
-          <li>
-            <b>New alignment options.</b> Video can be aligned vertically as well as horizontally.
-          </li>
-          <!-- <li>
-            By default, Ultrawidify will not kick in on "small videos". You have to be either in full screen or theater mode. Ultrawidify assumes that any
-            video that takes up more than 85% of the window width is being viewed in theater mode. This value may be tweaked later on. This feature can be
-            configured (or turned off entirely) via 'Advanced options' menu on the in-player UI.
-          </li> -->
-          <li>
-            The in-player extension UI will do a better job differentiating between the various level of support: "official" for the sites that Tam can check
-            on his own, "fingers crossed" for sites that Tam can't check because my load-bearing credit card can't support the weight of a dozen subscription
-            services, and "community support" for sites that enjoy support through the helping hand of people willing to help.
-          </li>
-          <li>
-            The in-player UI should now display a warning whenever Ultrawidify detects automatic aspect ratio detection isn't happening because the site uses DRM.
-          </li>
-          <!-- <li>
-            Better zooming. The slider is back, baby.
-          </li> -->
-          <!-- <li>
-            Panning option that's a bit more intuitive.
-          </li> -->
-        </ul>
-        <h3>Regressions</h3>
-        <ul>
-          <li>
-            Due to major changes under the hood, custom settings from older versions were NOT been migrated (probably).
-          </li>
-          <li>
-            It is unclear how extension acts on sites with more than one video.
-          </li>
-          <li>
-            Extension lost the ability to discriminate between iframes. Actions taken through the popup will be affect <b>all</b> iframes.
-          </li>
-          <li>
-            Hope the UI is worth the regressions, because getting UI to work has been a MAJOR pain in the ass.
-          </li>
-        </ul>
-      </div>
-      <div class="w-[1/2]" style="width: 50%; padding-left: 1rem; padding-top: 5rem;">
-        <h2>Thank you monies</h2>
-        <p>
-          If you think I deserve money for the work I did up to this point, you can bankroll my caffeine addiction.
-        </p>
-        <p class="text-center">
-          <a class="donate" href="https://www.paypal.com/paypalme/tamius" target="_blank">Donate on Paypal</a>
-        </p>
-
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-
-export default({
-  props: [
-    'settings'
-  ],
-  mounted() {
-    this.settings.active.whatsNewChecked = true;
-    this.settings.saveWithoutReload();
-  }
-});
-</script>
-<style lang="scss" scoped>
-.flex {
-  display: flex;
-}
-.flex-row {
-  flex-direction: row;
-}
-
-p, li {
-  font-size: 1rem;
-}
-small {
-  opacity: 0.5;
-  font-size: 0.8em;
-}
-a {
-  color: #fa6;
-}
-.text-center {
-  text-align: center;
-}
-.donate {
-  margin: 1rem;
-  padding: 0.5rem 1rem;
-  border-radius: 0.25rem;
-  background-color: #fa6;
-  color: #000;
-}
-</style>

src/csui/src/PlayerUiPanels/DebugPanel.vue

@@ -1,126 +0,0 @@
-<template>
-  <div>
-
-    <div>
-      <h1>{{loggerPanel.title}}<small><br/>{{loggerPanel.subtitle}}</small></h1>
-
-      <div>Logger configuration:</div>
-
-      <template v-if="loggerPanel.pasteConfMode">
-
-      </template>
-      <template v-else>
-        <JsonObject
-          label="logger-settings"
-          :value="currentSettings"
-          :ignoreKeys="{'allowLogging': false}"
-          @change="updateSettingsUi"
-        ></JsonObject>
-      </template>
-
-      <div class="flex flex-row flex-end">
-        <div class="button" @click="restoreLoggerSettings()">
-          Revert
-        </div>
-        <div class="button button-primary" @click="saveLoggerSettings()">
-          Save
-        </div>
-        <div class="button button-primary" @click="startLogging()">
-          Save and start logging
-        </div>
-      </div>
-    </div>
-
-  </div>
-</template>
-
-<script>
-import JsonObject from '../components/JsonEditor/JsonObject.vue'
-import Logger, { baseLoggingOptions } from '../../../ext/lib/Logger';
-
-export default {
-  components: {
-    JsonObject
-  },
-  data() {
-    return {
-      loggerPanelRotation: [{
-        title: 'DEFORESTATOR 5000',
-        subtitle: 'Iron Legion\'s finest logging tool'
-      },{
-        title: 'Astinus',
-        subtitle: 'Ultrawidify logging tool'
-      }, {
-        title: 'Tracer',
-        subtitle: "Maybe I'll be Tracer — I'm already printing stack traces."
-      }, {
-        title: 'Grûmsh',
-        subtitle: "He who watches (all the things printed to the console)."
-      }, {
-        title: 'Situation Room/The Council',
-        subtitle: 'We will always be watching.'
-      }, {
-        title: 'Isengard Land Management Services',
-        subtitle: "#log4saruman"
-      }, {
-        title: 'Saw Hero',
-        subtitle: 'Ultrawidify logging tool'
-      }],
-
-      loggerPanel: {
-        title: 'whoopsie daisy',
-        subtitle:  'you broke the header choosing script',
-        pasteConfMode: false,
-      },
-      lastSettings: undefined,
-      parsedSettings: undefined,
-      currentSettings: undefined
-    };
-  },
-  props: [
-    'settings',
-    'eventBus',
-    'site'
-  ],
-  created() {
-    this.loggerPanel = {
-      ...this.loggerPanelRotation[Math.floor(Math.random() * this.loggerPanelRotation.length)],
-      pasteConfMode: false,
-    };
-    this.loadDefaultConfig();
-  },
-  methods: {
-    loadDefaultConfig() {
-      this.lastSettings = baseLoggingOptions;
-      this.parsedSettings = JSON.stringify(this.lastSettings, null, 2) || '';
-      this.currentSettings = JSON.parse(JSON.stringify(this.lastSettings));
-    },
-    async getLoggerSettings() {
-      this.lastSettings = await Logger.getConfig() || baseLoggingOptions;
-      this.parsedSettings = JSON.stringify(this.lastSettings, null, 2) || '';
-      this.currentSettings = JSON.parse(JSON.stringify(this.lastSettings));
-    },
-    updateSettingsUi(val) {
-      try {
-        this.parsedSettings = JSON.stringify(val, null, 2);
-        this.lastSettings = val;
-        this.currentSettings = JSON.parse(JSON.stringify(this.lastSettings));
-      } catch (e) {
-
-      }
-    },
-    saveLoggerSettings() {
-      Logger.saveConfig({...this.lastSettings});
-    },
-    restoreLoggerSettings() {
-      this.getLoggerSettings();
-      this.confHasError = false;
-    },
-    async startLogging(){
-      this.logStringified = undefined;
-      await Logger.saveConfig({...this.lastSettings, allowLogging: true});
-      window.location.reload();
-    },
-  }
-}
-</script>

src/csui/src/PlayerUiPanels/InPlayerUiAdvertisement.vue

@@ -1,34 +0,0 @@
-<template>
-  <div>
-    <h1>In-player UI</h1>
-    <div
-      class="button b3"
-      style="margin: 16px; padding: 4px;"
-      @click="showInPlayerUi()"
-    >
-      Show in-player UI
-    </div>
-    <p></p>
-    <p></p>
-    <p>In-player UI should show and hide automatically as you start or stop moving your mouse inside the player window.</p>
-    <p>Note that by default, in-player UI may not show if player window is not big enough.</p>
-  </div>
-</template>
-
-<script>
-import UIProbeMixin from '../utils/UIProbeMixin';
-
-export default {
-  mixins: [
-    UIProbeMixin
-  ],
-  props: [
-    'eventBus',
-  ],
-  methods: {
-    showInPlayerUi() {
-      this.eventBus.send('uw-set-ui-state', {globalUiVisible: true}, {comms: {forwardTo: 'active'}});
-    }
-  }
-}
-</script>

src/csui/src/PlayerUiPanels/PanelComponents/ExtensionSettings/OtherSiteSettings.vue

@@ -1,122 +0,0 @@
-<template>
-  <div class="">
-    <template v-if="!selectedSite">
-      <div style="margin-top: 1rem; margin-bottom: 1rem;">
-        <b>NOTE:</b> Sites not on this list use default extension settings.
-      </div>
-      <div v-for="site of sites" :key="site.key" @click="selectedSite = site.key" class="flex flex-col container pointer" style="margin-top: 4px; padding: 0.5rem 1rem;">
-        <div class="flex flex-row">
-          <div class="flex-grow pointer">
-            <b>{{ site.key }}</b>
-            <span :style="getSiteTypeColor(site.type)">
-              (config: {{site.type ?? 'unknown'}})
-            </span></div>
-          <div>Edit</div>
-        </div>
-        <div class="flex flex-row">
-          <small>
-            Enabled: <span :style="getSiteEnabledColor(site.key, 'enable')"><small>{{ getSiteEnabledModes(site.key, 'enable') }}</small></span>;&nbsp;
-            Aard <span :style="getSiteEnabledColor(site.key, 'enableAard')"><small>{{ getSiteEnabledModes(site.key, 'enableAard') }}</small></span>;&nbsp;
-            kbd: <span :style="getSiteEnabledColor(site.key, 'enableKeyboard')"><small>{{ getSiteEnabledModes(site.key, 'enableKeyboard') }}</small></span>
-          </small>
-        </div>
-      </div>
-    </template>
-    <template v-if="selectedSite">
-      <div class="flex flex-row container" style="align-items: center; color: #dedede; margin-top: 1rem;">
-        <div @click="selectedSite = null" class="pointer button-hover" style=" font-size: 2em; padding: 0.5rem; margin-right: 1em;">
-          ←
-        </div>
-        <div>
-          Editing {{ selectedSite }}
-        </div>
-      </div>
-      <div>
-        <SiteExtensionSettings
-          v-if="selectedSiteSettings"
-          :settings="settings"
-          :siteSettings="selectedSiteSettings"
-          :isDefaultConfiguration="false"
-        ></SiteExtensionSettings>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-import ExtensionMode from '../../../../../common/enums/ExtensionMode.enum';
-import SiteExtensionSettings from './SiteExtensionSettings.vue';
-
-export default {
-  data() {
-    return {
-      selectedSite: null,
-    }
-  },
-  props: [
-    'settings',
-  ],
-  components: {
-    SiteExtensionSettings,
-  },
-  computed: {
-    sites() {
-      if (!this.settings?.active?.sites) {
-        return [];
-      } else {
-        const sites = [];
-        for (const siteKey in this.settings.active.sites) {
-          if (!siteKey.startsWith('@')) {
-            sites.push({
-              key: siteKey,
-              ...this.settings.active.sites[siteKey]
-            })
-          }
-        };
-        sites.sort((a, b) => {
-          const cmpa = a.key.replace('www.', '');
-          const cmpb = b.key.replace('www.', '');
-
-          return cmpa < cmpb ? -1 : 1;
-        });
-        return sites;
-      }
-    },
-    selectedSiteSettings() {
-      return this.settings?.getSiteSettings(this.selectedSite) ?? null;
-    }
-  },
-  methods: {
-    getSiteTypeColor(siteType) {
-      switch (siteType) {
-        case 'official': return 'color: #fa6';
-        case 'community': return 'color: rgb(114, 114, 218)';
-        case 'officially-disabled': return 'color: #f00';
-        case 'testing': return 'color: #d81';
-        default: return 'color: rgb(138, 65, 126)'
-      };
-    },
-    getSiteEnabledColor(site, component) {
-      const status = this.getSiteEnabledModes(site, component);
-
-      return status === 'disabled' ? 'color: #f00' : 'color: #1f8';
-    },
-    getSiteEnabledModes(site, component) {
-      if (this.settings?.getSiteSettings(site).data[component]?.normal === ExtensionMode.Enabled) {
-        return 'always';
-      }
-      if (this.settings?.getSiteSettings(site).data[component]?.theater === ExtensionMode.Enabled) {
-        return 'T + FS';
-      }
-      if (this.settings?.getSiteSettings(site).data[component]?.fullscreen === ExtensionMode.Enabled) {
-        return 'fullscreen';
-      }
-      return 'disabled';
-    }
-  }
-}
-</script>
-
-<style lang="scss" src="../../../../res/css/flex.scss" scoped></style>
-<style lang="scss" src="../../../res-common/panels.scss" scoped></style>
-<style lang="scss" src="../../../res-common/common.scss" scoped></style>

src/csui/src/PlayerUiPanels/PanelComponents/ExtensionSettings/SiteExtensionSettings.vue

@@ -1,462 +0,0 @@
-<template>
-  <div>
-    <!-- Enable extension -->
-    <div class="field">
-      <div class="label">
-        Enable extension under the following conditions:
-      </div>
-      <div class="select">
-        <select
-          v-model="simpleExtensionSettings.enable"
-          @click="setExtensionMode('enable', $event)"
-        >
-          <option
-            v-if="simpleExtensionSettings.enable === 'complex'"
-            value="complex"
-          >
-            (Site uses advanced settings)
-          </option>
-          <template v-if="isDefaultConfiguration">
-            <option value="disabled">
-              Disabled (unless enabled for specific site)
-            </option>
-          </template>
-          <template v-else>
-            <option value="default">
-              Use default ()
-            </option>
-            <option value="disabled">
-              Never
-            </option>
-          </template>
-          <option value="fs">
-            Fullscreen only
-          </option>
-          <option value="theater">
-            Fullscreen and theater mode
-          </option>
-          <option value="enabled">
-            Always
-          </option>
-        </select>
-      </div>
-    </div>
-
-    <!-- Enable AARD -->
-    <div class="field">
-      <div class="label">
-        Enable automatic aspect ratio detection under the following conditions:
-      </div>
-      <div class="select">
-        <select
-          v-model="simpleExtensionSettings.enableAard"
-          @click="setExtensionMode('enableAard', $event)"
-        >
-          <option
-            v-if="simpleExtensionSettings.enable === 'complex'"
-            value="complex"
-          >
-            (Site uses advanced settings)
-          </option>
-          <template v-if="isDefaultConfiguration">
-            <option value="disabled">
-              Disabled (unless enabled for specific site)
-            </option>
-          </template>
-          <template v-else>
-            <option value="default">
-              Use default ()
-            </option>
-            <option value="disabled">
-              Never
-            </option>
-          </template>
-          <option value="fs">
-            Fullscreen only
-          </option>
-          <option value="theater">
-            Fullscreen and theater mode
-          </option>
-          <option value="enabled">
-            Always
-          </option>
-        </select>
-      </div>
-    </div>
-
-    <!-- Enable keyboard -->
-    <div class="field">
-      <div class="label">
-        Enable keyboard shortcuts under the following conditions
-      </div>
-      <div class="select">
-        <select
-          v-model="simpleExtensionSettings.enableKeyboard"
-          @click="setExtensionMode('enableKeyboard', $event)"
-        >
-          <option
-            v-if="simpleExtensionSettings.enable === 'complex'"
-            value="complex"
-          >
-            (Site uses advanced settings)
-          </option>
-          <template v-if="isDefaultConfiguration">
-            <option value="disabled">
-              Disabled (unless enabled for specific site)
-            </option>
-          </template>
-          <template v-else>
-            <option value="default">
-              Use default ()
-            </option>
-            <option value="disabled">
-              Never
-            </option>
-          </template>
-          <option value="fs">
-            Fullscreen only
-          </option>
-          <option value="theater">
-            Fullscreen and theater mode
-          </option>
-          <option value="enabled">
-            Always
-          </option>
-        </select>
-      </div>
-    </div>
-
-    <!-- Default crop -->
-    <div class="field">
-      <div class="label">Default crop:</div>
-      <div class="select">
-        <select
-          v-model="siteDefaultCrop"
-          @change="setOption('defaults.crop', $event)"
-        >
-          <option
-            v-if="!isDefaultConfiguration"
-            :value="JSON.stringify({useDefault: true})"
-          >
-            Use default ({{getCommandValue(settings?.active.commands.crop, siteSettings.data.defaults.crop)}})
-          </option>
-          <option
-            v-for="(command, index) of settings?.active.commands.crop"
-            :key="index"
-            :value="JSON.stringify(command.arguments)"
-          >
-            {{command.label}}
-          </option>
-        </select>
-      </div>
-      <div class="hint">This is how extension will crop video if/when autodetection is disabled. Pick 'Reset' option to keep aspect ratio as-is by default.</div>
-    </div>
-
-    <!-- Default stretch -->
-    <div class="field">
-      <div class="label">Default stretch:</div>
-      <div class="select">
-        <select
-          v-model="siteDefaultStretch"
-          @change="setOption('defaults.stretch', $event)"
-        >
-          <option
-            v-if="!isDefaultConfiguration"
-            :value="JSON.stringify({useDefault: true})"
-          >
-            Use default ({{getCommandValue(settings?.active.commands.stretch, siteSettings.data.defaults.stretch)}})
-          </option>
-          <option
-            v-for="(command, index) of settings?.active.commands.stretch"
-            :key="index"
-            :value="JSON.stringify(command.arguments)"
-          >
-            {{command.label}}
-          </option>
-        </select>
-      </div>
-    </div>
-
-    <!-- Default alignment -->
-    <div class="field">
-      <div class="label">Default alignment:</div>
-      <div class="select">
-        <select
-          v-model="siteDefaultAlignment"
-          @change="setOption('defaults.alignment', $event)"
-        >
-          <option
-            v-if="!isDefaultConfiguration"
-            :value="JSON.stringify({useDefault: true})"
-          >
-            Use default ({{getAlignmentLabel(siteSettings.data.defaults.alignment)}})
-          </option>
-          <option
-            v-for="(command, index) of alignmentOptions"
-            :key="index"
-            :value="JSON.stringify(command.arguments)"
-          >
-            {{command.label}}
-          </option>
-        </select>
-      </div>
-    </div>
-
-    <!-- Crop, et. al. Persistence -->
-    <div class="field">
-      <div class="label">Persist crop, stretch, and alignment between videos</div>
-      <div class="select">
-        <select
-          v-model="siteDefaultCropPersistence"
-          @click="setOption('persistCSA', $event)"
-        >
-          <option
-            v-if="!isDefaultConfiguration"
-            :value="CropModePersistence.Default"
-          >
-            Use default ({{defaultPersistanceLabel}})
-          </option>
-          <option :value="CropModePersistence.Disabled">Disabled</option>
-          <option :value="CropModePersistence.UntilPageReload">Until page reload</option>
-          <option :value="CropModePersistence.CurrentSession">Current session</option>
-          <option :value="CropModePersistence.Forever">Always persist</option>
-        </select>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import ExtensionMode from '../../../../../common/enums/ExtensionMode.enum';
-import VideoAlignmentType from '../../../../../common/enums/VideoAlignmentType.enum';
-import CropModePersistence from './../../../../../common/enums/CropModePersistence.enum';
-
-export default {
-  data() {
-    return {
-      CropModePersistence: CropModePersistence,
-      alignmentOptions: [
-        {label: 'Top left', arguments: {x: VideoAlignmentType.Left, y: VideoAlignmentType.Top}},
-        {label: 'Top center', arguments: {x: VideoAlignmentType.Center, y: VideoAlignmentType.Top}},
-        {label: 'Top right', arguments: {x: VideoAlignmentType.Right, y: VideoAlignmentType.Top}},
-        {label: 'Left', arguments: {x: VideoAlignmentType.Left, y: VideoAlignmentType.Center}},
-        {label: 'Center', arguments: {x: VideoAlignmentType.Center, y: VideoAlignmentType.Center}},
-        {label: 'Right', arguments: {x: VideoAlignmentType.Right, y: VideoAlignmentType.Center}},
-        {label: 'Bottom left', arguments: {x: VideoAlignmentType.Left, y: VideoAlignmentType.Bottom}},
-        {label: 'Bottom center', arguments: {x: VideoAlignmentType.Center, y: VideoAlignmentType.Bottom}},
-        {label: 'Bottom right', arguments: {x: VideoAlignmentType.Right, y: VideoAlignmentType.Bottom}}
-      ]
-    }
-  },
-  mixins: [
-
-  ],
-  props: [
-    'settings',
-    'siteSettings',
-    'isDefaultConfiguration'
-  ],
-  components: {
-
-  },
-  computed: {
-    simpleExtensionSettings() {
-      return {
-        enable: this.compileSimpleSettings('enable'),
-        enableAard: this.compileSimpleSettings('enableAard'),
-        enableKeyboard: this.compileSimpleSettings('enableKeyboard'),
-      }
-    },
-    siteDefaultCrop() {
-      return this.siteSettings.raw?.defaults?.crop ? JSON.stringify(this.siteSettings.raw?.defaults?.crop) : JSON.stringify({useDefault: true});
-    },
-    siteDefaultStretch() {
-      return this.siteSettings.raw?.defaults?.stretch ? JSON.stringify(this.siteSettings.raw?.defaults?.stretch) : JSON.stringify({useDefault: true});
-    },
-    siteDefaultAlignment() {
-      return this.siteSettings.raw?.defaults?.alignment ? JSON.stringify(this.siteSettings.raw?.defaults?.alignment) : JSON.stringify({useDefault: true});
-    },
-    siteDefaultCropPersistence() {
-      return this.siteSettings.raw?.persistCSA ?? undefined;
-    },
-    defaultPersistanceLabel() {
-      switch (this.siteSettings.defaultSettings.persistCSA) {
-        case CropModePersistence.CurrentSession:
-          return 'current session';
-        case CropModePersistence.Disabled:
-          return 'disabled';
-        case CropModePersistence.UntilPageReload:
-          return 'until page reload';
-        case CropModePersistence.Forever:
-          return 'Always persist';
-      }
-
-      return '??';
-    }
-  },
-  methods: {
-    /**
-     * Compiles our extension settings into more user-friendly options
-     */
-    compileSimpleSettings(component) {
-      try {
-        if (
-          this.siteSettings?.data?.[component]?.normal        === ExtensionMode.Disabled
-          && this.siteSettings?.data?.[component]?.theater    === ExtensionMode.Disabled
-          && this.siteSettings?.data?.[component]?.fullscreen === ExtensionMode.Disabled
-        ) {
-          return 'disabled';
-        }
-        if (
-          this.siteSettings?.data?.[component]?.normal        === ExtensionMode.Default
-          && this.siteSettings?.data?.[component]?.theater    === ExtensionMode.Default
-          && this.siteSettings?.data?.[component]?.fullscreen === ExtensionMode.Default
-        ) {
-          return 'default';
-        }
-        if (
-          this.siteSettings?.data?.[component]?.normal        === ExtensionMode.Disabled
-          && this.siteSettings?.data?.[component]?.theater    === ExtensionMode.Disabled
-          && this.siteSettings?.data?.[component]?.fullscreen === ExtensionMode.Enabled
-        ) {
-          return 'fs';
-        }
-        if (
-          this.siteSettings?.data?.[component]?.normal        === ExtensionMode.Disabled
-          && this.siteSettings?.data?.[component]?.theater    === ExtensionMode.Enabled
-          && this.siteSettings?.data?.[component]?.fullscreen === ExtensionMode.Enabled
-        ) {
-          return 'theater';
-        }
-        if (
-          this.siteSettings?.data?.[component]?.normal        === ExtensionMode.Enabled
-          && this.siteSettings?.data?.[component]?.theater    === ExtensionMode.Enabled
-          && this.siteSettings?.data?.[component]?.fullscreen === ExtensionMode.Enabled
-        ) {
-          return 'enabled';
-        }
-
-        return 'complex';
-      } catch (e) {
-        return 'loading';
-      }
-    },
-
-    getCommandValue(availableCommands, command) {
-      for (const cmd of availableCommands) {
-        if (JSON.stringify(cmd.arguments) === JSON.stringify(command)) {
-          return cmd.label;
-        }
-      }
-      return 'Unknown command';
-    },
-
-    getAlignmentLabel(alignment) {
-      // in case default settings don't have this set
-      if (!alignment) {
-        return 'Center'
-      }
-
-      let x, y;
-      if (alignment.x === VideoAlignmentType.Center) {
-        x = 'center';
-      } else if (alignment.x === VideoAlignmentType.Left) {
-        x = 'left';
-      } else if (alignment.x === VideoAlignmentType.Right) {
-        x = 'right';
-      } else {
-        x = '??'
-      }
-
-      if (alignment.y === VideoAlignmentType.Center) {
-        y = 'center';
-      } else if (alignment.y === VideoAlignmentType.Bottom) {
-        y = 'bottom';
-      } else if (alignment.y === VideoAlignmentType.Top) {
-        y = 'top';
-      } else {
-        y = '???'
-      };
-
-      if (x === y) {
-        return x;
-      }
-      return `${y} ${x}`;
-    },
-    getOption(option) {
-
-    },
-    async setOption(option, $event) {
-      const value = $event.target.value;
-      let commandArguments;
-
-      // if argument is json, parse json. Otherwise, pass the value as-is
-      try {
-        commandArguments = value !== undefined ? JSON.parse(value) : undefined;
-      } catch(e) {
-        commandArguments = value;
-      }
-
-      if (commandArguments.useDefault) {
-        commandArguments = undefined;
-      }
-
-      await this.siteSettings.set(option, commandArguments);
-      this.$nextTick( () => this.$forceUpdate() );
-    },
-    setExtensionMode(component, event) {
-      const option = event.target.value;
-
-      if (option === 'complex') {
-        return;
-      }
-
-      if (option === 'default') {
-        return this.siteSettings.set(component, {
-          normal: ExtensionMode.Default,
-          theater: ExtensionMode.Default,
-          fullscreen: ExtensionMode.Default
-        });
-      }
-      if (option === 'disabled') {
-        return this.siteSettings.set(component, {
-          normal: ExtensionMode.Disabled,
-          theater: ExtensionMode.Disabled,
-          fullscreen: ExtensionMode.Disabled
-        });
-      }
-      if (option === 'enabled') {
-        return this.siteSettings.set(component, {
-          normal: ExtensionMode.Enabled,
-          theater: ExtensionMode.Enabled,
-          fullscreen: ExtensionMode.Enabled
-        });
-      }
-      if (option === 'theater') {
-        return this.siteSettings.set(component, {
-          normal: ExtensionMode.Disabled,
-          theater: ExtensionMode.Enabled,
-          fullscreen: ExtensionMode.Enabled
-        });
-      }
-      if (option === 'fs') {
-        return this.siteSettings.set(component, {
-          normal: ExtensionMode.Disabled,
-          theater: ExtensionMode.Disabled,
-          fullscreen: ExtensionMode.Enabled
-        });
-      }
-    }
-  }
-
-}
-</script>
-
-<style lang="scss" src="../../../../res/css/flex.scss" scoped></style>
-<style lang="scss" src="../../../res-common/panels.scss" scoped></style>
-<style lang="scss" src="../../../res-common/common.scss" scoped></style>
-<style scoped>
-.button-hover:hover {
-  color: #fa6;
-}
-</style>

src/csui/src/PlayerUiPanels/PanelComponents/VideoSettings/CropOptionsPanel.vue

@@ -1,244 +0,0 @@
-<template>
-  <div class="sub-panel-content flex flex-row flex-wrap">
-
-    <ShortcutButton
-      v-for="(command, index) of settings?.active.commands.crop"
-      class="flex b3 button"
-      :class="{active: editMode ? index === editModeOptions?.crop?.selectedIndex : isActiveCrop(command)}"
-      :key="index"
-      :label="command.label"
-      :shortcut="getKeyboardShortcutLabel(command)"
-      @click="editMode ? editAction(command, index, 'crop') : execAction(command)"
-    >
-    </ShortcutButton>
-
-    <!-- "Add new" button -->
-    <ShortcutButton
-      v-if="editMode"
-      class="button b3"
-     :class="{active: editMode ? editModeOptions?.crop?.selectedIndex === null : isActiveCrop(command)}"
-      label="Add new"
-      @click="editAction(
-        {action: 'set-ar', label: 'New aspect ratio', arguments: {type: AspectRatioType.Fixed}},
-        null,
-        'crop'
-      )"
-    ></ShortcutButton>
-  </div>
-
-  <!-- EDIT MODE PANEL -->
-  <div
-    v-if="editMode && !editModeOptions?.crop?.selected"
-    class="sub-panel-content"
-  >
-    <div class="edit-action-area">
-      Click a button to edit
-    </div>
-  </div>
-  <div v-if="editMode && editModeOptions?.crop?.selected" class="sub-panel-content">
-    <div class="edit-action-area-header">
-      <span class="text-primary">Editing options for:</span> <b>{{editModeOptions?.crop?.selected?.label}}</b>&nbsp;
-      <template v-if="editModeOptions?.crop?.selectedIndex === null && editModeOptions?.crop?.selected?.label !== 'New aspect ratio'">(New ratio)</template>
-    </div>
-    <div class="edit-action-area">
-      <!-- Some options are only shown for type 4 (fixed) crops -->
-      <template v-if="editModeOptions?.crop?.selected?.arguments?.type === AspectRatioType.Fixed">
-        <div class="field">
-          <div class="label">
-            Ratio:
-          </div>
-          <div class="input">
-            <!-- We do an ugly in order to avoid spamming functions down at the bottom -->
-            <input
-              v-model="editModeOptions.crop.selected.arguments.ratio"
-              @blur="editModeOptions.crop.selected.label === 'New aspect ratio' ? editModeOptions.crop.selected.label = editModeOptions.crop.selected.arguments.ratio : null"
-            >
-          </div>
-          <div class="hint">
-            You can enter a ratio in width:height format (e.g. "21:9" or "1:2.39"), or just the factor
-            (in this case, "1:2.39" would become "2.39" and "21:9" would become "2.33"). You should enter
-            your numbers without quote marks. Number will be converted to factor form on save.
-          </div>
-        </div>
-        <div class="field">
-          <div class="label">
-            Label:
-          </div>
-          <div class="input">
-            <input v-model="editModeOptions.crop.selected.label">
-          </div>
-          <div class="hint">
-            Label for the button. You can make it say something other than ratio.
-          </div>
-        </div>
-      </template>
-
-      <!-- editing keyboard shortcuts is always allowed -->
-      <div class="field">
-        <div class="label">Shortcut:</div>
-        <div class="">
-          <EditShortcutButton
-            :shortcut="editModeOptions?.crop?.selected?.shortcut"
-            @shortcutChanged="updateSelectedShortcut($event, 'crop')"
-          >
-          </EditShortcutButton>
-        </div>
-        <div class="hint">
-          <b>Note:</b> Your browser and OS already use certain key combinations that involve Ctrl and Meta (Windows) keys — and, to a lesser extent, Alt.
-          The extension doesn't (and cannot) check whether the keyboard shortcut you enter is actually free for you to use. The extension also won't override
-          any keyboard shortcuts defined by the site itself.
-        </div>
-      </div>
-
-      <div class="flex flex-row flex-end">
-        <div
-          v-if="editModeOptions?.crop?.selected?.arguments?.type === AspectRatioType.Fixed && editModeOptions?.crop?.selectedIndex !== null"
-          class="button"
-          @click="deleteAction('crop')"
-        >
-          <mdicon name="delete"></mdicon> Delete
-        </div>
-        <div class="flex-grow"></div>
-        <div class="button" @click="cancelEdit('crop')">Cancel</div>
-        <div class="button" @click="saveShortcut('crop')">
-          <mdicon name="floppy"></mdicon>
-          &nbsp;
-          <template v-if="editModeOptions?.crop?.selectedIndex === null">Add</template>
-          <template v-else>Save</template>
-        </div>
-      </div>
-
-    </div>
-  </div>
-
-  <div v-if="siteSettings" class="edit-action-area">
-    <div class="field">
-      <div class="label">Default for this site</div>
-      <div class="select">
-        <select
-          :value="siteDefaultCrop"
-          @change="setDefaultCrop($event, 'site')"
-        >
-          <option
-            v-for="(command, index) of settings?.active.commands.crop"
-            :key="index"
-            :value="JSON.stringify(command.arguments)"
-          >
-            {{command.label}}
-          </option>
-        </select>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import ShortcutButton from '../../../components/ShortcutButton.vue';
-import EditShortcutButton from '../../../components/EditShortcutButton';
-import EditModeMixin from '../../../utils/EditModeMixin';
-import KeyboardShortcutParserMixin from '../../../utils/KeyboardShortcutParserMixin';
-import CommsMixin from '../../../utils/CommsMixin';
-import AspectRatioType from '../../../../../common/enums/AspectRatioType.enum';
-
-export default {
-  data() {
-
-    return {
-      AspectRatioType: AspectRatioType,
-
-      // TODO: this should be mixin?
-      resizerConfig: {
-        crop: null,
-        stretch: null,
-        zoom: null,
-        pan: null
-      }
-    }
-  },
-  mixins: [
-    // ComputeActionsMixin,
-    EditModeMixin,
-    KeyboardShortcutParserMixin,
-    CommsMixin
-  ],
-  props: [
-    'settings',      // required for buttons and actions, which are global
-    'siteSettings',
-    'eventBus',
-    'isEditing'
-  ],
-  components: {
-    ShortcutButton,
-    EditShortcutButton,
-  },
-  computed: {
-    siteDefaultCrop()  {
-      if (!this.siteSettings) {
-        return null;
-      }
-      return JSON.stringify(
-        this.siteSettings.data.defaults.crop
-      );
-    },
-  },
-  created() {
-    if (this.isEditing) {
-      this.enableEditMode();
-    }
-  },
-  watch: {
-    isEditing(newValue, oldValue) {
-      if (newValue) {
-        this.enableEditMode();
-      } else {
-        this.disableEditMode();
-      }
-    }
-  },
-  methods: {
-    /**
-     * Sets default crop, for either site or global
-     */
-    setDefaultCrop($event, scope) {
-      if (!this.siteSettings) {
-        return;
-      }
-      const commandArguments = JSON.parse($event.target.value);
-
-      this.siteSettings.set('defaults.crop', commandArguments);
-      this.settings.saveWithoutReload();
-    },
-
-    /**
-     * Determines whether a given crop command is the currently active one
-     */
-    isActiveCrop(cropCommand) {
-      if (! this.resizerConfig.crop || !this.siteSettings) {
-        return false;
-      }
-
-      const defaultCrop = this.siteSettings.data.defaults.crop;
-
-      if (cropCommand.arguments.type === AspectRatioType.Automatic) {
-        return this.resizerConfig.crop.type === AspectRatioType.Automatic
-          || this.resizerConfig.crop.type === AspectRatioType.AutomaticUpdate
-          || this.resizerConfig.crop.type === AspectRatioType.Initial && defaultCrop === AspectRatioType.Automatic;
-      }
-      if (cropCommand.arguments.type === AspectRatioType.Reset) {
-        return this.resizerConfig.crop.type === AspectRatioType.Reset
-          || this.resizerConfig.crop.type === AspectRatioType.Initial && defaultCrop !== AspectRatioType.Automatic;
-      }
-      if (cropCommand.arguments.type === AspectRatioType.Fixed) {
-        return this.resizerConfig.crop.type === AspectRatioType.Fixed
-          && this.resizerConfig.crop.ratio === cropCommand.arguments.ratio;
-      }
-      // only legacy options (fitw, fith) left to handle:
-      return cropCommand.arguments.type === this.resizerConfig.crop.type;
-    },
-  }
-}
-</script>
-
-<style lang="scss" src="../../../../res/css/flex.scss" scoped></style>
-<style lang="scss" src="../../../res-common/panels.scss" scoped></style>
-<style lang="scss" src="../../../res-common/common.scss" scoped></style>

src/csui/src/PlayerUiPanels/PanelComponents/VideoSettings/StretchOptionsPanel.vue

@@ -1,249 +0,0 @@
-<template>
-  <div class="sub-panel-content flex flex-row flex-wrap">
-    <ShortcutButton
-      v-for="(command, index) of settings?.active.commands.stretch"
-      class="b3 button"
-      :class="{active: editMode ? index === editModeOptions?.stretch?.selectedIndex : isActiveStretch(command)}"
-      :key="index"
-      :label="command.label"
-      :shortcut="getKeyboardShortcutLabel(command)"
-      @click="editMode ? editAction(command, index, 'stretch') : execAction(command)"
-    >
-    </ShortcutButton>
-
-    <!-- "Add new" button -->
-    <ShortcutButton
-      v-if="editMode"
-      class="button b3"
-      label="Add new"
-      @click="editAction(
-        {action: 'set-stretch', label: 'Stretch to ...', arguments: {type: StretchType.FixedSource}},
-        null,
-        'stretch'
-      )"
-    ></ShortcutButton>
-  </div>
-
-  <!-- EDIT MODE PANEL -->
-  <div
-    v-if="editMode && !editModeOptions?.stretch?.selected"
-    class="sub-panel-content"
-  >
-    <div class="edit-action-area">
-      Click a button to edit
-    </div>
-  </div>
-  <div v-if="editMode && editModeOptions?.stretch?.selected" class="sub-panel-content">
-    <div class="edit-action-area-header">
-      <span class="text-primary">Editing options for:</span> <b>{{editModeOptions?.stretch?.selected?.label}}</b>&nbsp;
-      <template v-if="editModeOptions?.stretch?.selectedIndex === null && editModeOptions?.stretch?.selected?.label !== 'Stretch to ...'">(New option)</template>
-    </div>
-    <div class="edit-action-area">
-      <!-- There are some special options for 'thin borders' -->
-      <template v-if="editModeOptions?.stretch?.selected?.arguments?.type === StretchType.Conditional">
-        <div class="field">
-          <div class="label">
-            Limit:
-          </div>
-          <div class="input">
-            <input
-              v-model="editModeOptions.stretch.selected.arguments.limit"
-            >
-          </div>
-          <div class="hint">
-            If vertical borders would take up less than this much of screen width, the image will be stretched. If the borders are too thick, image will not be stretched.
-            Value of 1 means 100%. Value of 0.1 means vertical black bars can take up 10% of the width at most. There's no validation on this, use common sense.
-          </div>
-        </div>
-      </template>
-
-      <!-- Some options are only shown for type 5 (fixed) stretch -->
-      <template v-if="editModeOptions?.stretch?.selected?.arguments?.type === StretchType.FixedSource">
-        <div class="field">
-          <div class="label">
-            Ratio:
-          </div>
-          <div class="input">
-            <!-- We do an ugly in order to avoid spamming functions down at the bottom -->
-            <input
-              v-model="editModeOptions.stretch.selected.arguments.ratio"
-              @blur="editModeOptions.stretch.selected.label === 'Stretch to ...' ? editModeOptions.stretch.selected.label = `Stretch to ${editModeOptions.stretch.selected.arguments.ratio}` : null"
-            >
-          </div>
-          <div class="hint">
-            You can enter a ratio in width:height format (e.g. "21:9" or "1:2.39"), or just the factor
-            (in this case, "1:2.39" would become "2.39" and "21:9" would become "2.33"). You should enter
-            your numbers without quote marks. Number will be converted to factor form on save.
-          </div>
-        </div>
-        <div class="field">
-          <div class="label">
-            Label:
-          </div>
-          <div class="input">
-            <input v-model="editModeOptions.stretch.selected.label">
-          </div>
-          <div class="hint">
-            Label for the button. You can make it say something other than ratio.
-          </div>
-        </div>
-      </template>
-
-      <!-- editing keyboard shortcuts is always allowed -->
-      <div class="field">
-        <div class="label">Shortcut:</div>
-        <div class="">
-          <EditShortcutButton
-            :shortcut="editModeOptions?.stretch?.selected?.shortcut"
-            @shortcutChanged="updateSelectedShortcut($event, 'stretch')"
-          >
-          </EditShortcutButton>
-        </div>
-        <div class="hint">
-          <b>Note:</b> Your browser and OS already use certain key combinations that involve Ctrl and Meta (Windows) keys — and, to a lesser extent, Alt.
-          The extension doesn't (and cannot) check whether the keyboard shortcut you enter is actually free for you to use. The extension also won't override
-          any keyboard shortcuts defined by the site itself.
-        </div>
-      </div>
-
-      <div class="flex flex-row flex-end">
-        <div
-          v-if="editModeOptions?.stretch?.selected?.arguments?.type === StretchType.FixedSource && editModeOptions?.stretch?.selectedIndex !== null"
-          class="button"
-          @click="deleteAction('stretch')"
-        >
-          <mdicon name="delete"></mdicon> Delete
-        </div>
-        <div class="flex-grow"></div>
-        <div class="button" @click="cancelEdit('stretch')">Cancel</div>
-        <div class="button" @click="saveShortcut('stretch')">
-          <mdicon name="floppy"></mdicon>
-          &nbsp;
-          <template v-if="editModeOptions?.crop?.selectedIndex === null">Add</template>
-          <template v-else>Save</template>
-        </div>
-      </div>
-
-    </div>
-  </div>
-
-  <div v-if="siteSettings" class="edit-action-area">
-    <div class="field">
-      <div class="label">Default for this site:</div>
-      <div class="select">
-        <div class="select">
-          <select
-            v-model="siteDefaultStretchMode"
-            @change="setDefaultStretchingMode($event, 'site')"
-          >
-            <option
-              v-for="(command, index) of settings?.active.commands.stretch"
-              :key="index"
-              :value="JSON.stringify(command.arguments)"
-            >
-              {{command.label}}
-            </option>
-          </select>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import ShortcutButton from '../../../components/ShortcutButton.vue';
-import EditShortcutButton from '../../../components/EditShortcutButton';
-import EditModeMixin from '../../../utils/EditModeMixin';
-import KeyboardShortcutParserMixin from '../../../utils/KeyboardShortcutParserMixin';
-import CommsMixin from '../../../utils/CommsMixin';
-import StretchType from '../../../../../common/enums/StretchType.enum';
-
-export default {
-  data() {
-    return {
-      exec: null,
-      StretchType: StretchType,
-
-      // TODO: this should be mixin?
-      resizerConfig: {
-        crop: null,
-        stretch: null,
-        zoom: null,
-        pan: null
-      }
-    }
-  },
-  mixins: [
-    // ComputeActionsMixin,
-    EditModeMixin,
-    KeyboardShortcutParserMixin,
-    CommsMixin
-  ],
-  props: [
-    'settings',      // required for buttons and actions, which are global
-    'siteSettings',
-    'eventBus',
-    'isEditing'
-  ],
-  components: {
-    ShortcutButton,
-    EditShortcutButton,
-  },
-  computed: {
-    siteDefaultStretch() {
-      if (!this.siteSettings) {
-        return null;
-      }
-      return JSON.stringify(
-        this.siteSettings.data.defaults.stretch
-      );
-    },
-  },
-  created() {
-    if (this.isEditing) {
-      this.enableEditMode();
-    }
-  },
-  watch: {
-    isEditing(newValue, oldValue) {
-      if (newValue) {
-        this.enableEditMode();
-      } else {
-        this.disableEditMode();
-      }
-    }
-  },
-  methods: {
-    /**
-     * Sets default stretching mode, for either site or global
-     */
-    setDefaultStretchingMode($event, globalOrSite) {
-      if (!this.siteSettings) {
-        return;
-      }
-      const commandArguments = JSON.parse($event.target.value);
-      this.siteSettings.set('defaults.stretch', commandArguments);
-    },
-
-    /**
-     * Determines whether a given stretch command is the currently active one
-     */
-    isActiveStretch(stretchCommand) {
-      if (! this.resizerConfig.stretch || !this.siteSettings) {
-        return false;
-      }
-
-      // const defaultCrop = this.settings.getDefaultStretch(this.site);
-
-      if ([StretchType.NoStretch, StretchType.Basic, StretchType.Hybrid, StretchType.Conditional, StretchType.Default].includes(stretchCommand.arguments.type)) {
-        return this.resizerConfig.stretch.type === stretchCommand.arguments.type;
-      }
-      return this.resizerConfig.crop.type === stretchCommand.arguments.type && this.resizerConfig.crop.ratio === stretchCommand.arguments.ratio;
-    },
-  }
-}
-</script>
-
-<style lang="scss" src="../../../../res/css/flex.scss" scoped></style>
-<style lang="scss" src="../../../res-common/panels.scss" scoped></style>
-<style lang="scss" src="../../../res-common/common.scss" scoped></style>

src/csui/src/PlayerUiPanels/PanelComponents/VideoSettings/ZoomOptionsPanel.vue

@@ -1,156 +0,0 @@
-<template>
-  <div class="flex flex-col">
-    <!--
-      min, max and value need to be implemented in js as this slider
-      should use logarithmic scale
-    -->
-    <div class="flex flex-row flex-end">
-      <Button
-        v-if="zoomAspectRatioLocked"
-        label="Unlock aspect ratio"
-        icon="lock-open"
-        :fixedWidth="true"
-        @click="toggleZoomAr()"
-      >
-      </Button>
-      <Button
-        v-else
-        label="Lock aspect ratio"
-        icon="lock"
-        :fixedWidth="true"
-        @click="toggleZoomAr()"
-      >
-      </Button>
-    </div>
-    <template v-if="zoomAspectRatioLocked">
-      <input id="_input_zoom_slider"
-              class="input-slider"
-              type="range"
-              step="any"
-              min="-1"
-              max="3"
-              :value="zoom.x"
-              @input="changeZoom($event.target.value)"
-              />
-      <div style="overflow: auto" class="flex flex-row">
-        <div class="flex flex-grow medium-small x-pad-1em">
-          Zoom: {{getZoomForDisplay('x')}}
-        </div>
-        <div class="flex flex-nogrow flex-noshrink medium-small">
-          <a class="_zoom_reset x-pad-1em" @click="resetZoom()">reset</a>
-        </div>
-      </div>
-    </template>
-    <template v-else>
-      <div>Horizontal zoom</div>
-      <input id="_input_zoom_slider"
-              class="input-slider"
-              type="range"
-              step="any"
-              min="-1"
-              max="4"
-              :value="zoom.x"
-              @input="changeZoom($event.target.value, 'x')"
-      />
-
-      <div>Vertical zoom</div>
-      <input id="_input_zoom_slider"
-              class="input-slider"
-              type="range"
-              step="any"
-              min="-1"
-              max="3"
-              :value="zoom.y"
-              @input="changeZoom($event.target.value, 'y')"
-      />
-
-      <div style="overflow: auto" class="flex flex-row">
-        <div class="flex flex-grow medium-small x-pad-1em">
-          Zoom: {{getZoomForDisplay('x')}} x {{getZoomForDisplay('y')}}
-        </div>
-        <div class="flex flex-nogrow flex-noshrink medium-small">
-          <a class="_zoom_reset x-pad-1em" @click="resetZoom()">reset</a>
-        </div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-
-export default {
-  data() {
-    return {
-      zoomAspectRatioLocked: true,
-      zoom: {
-        x: 0,
-        y: 0
-      },
-
-      // TODO: this should be mixin?
-      resizerConfig: {
-        crop: null,
-        stretch: null,
-        zoom: null,
-        pan: null
-      }
-    }
-  },
-  mixins: [
-
-  ],
-  props: [
-    'settings',      // required for buttons and actions, which are global
-    'siteSettings',
-    'eventBus',
-    'isEditing'
-  ],
-  methods: {
-    getZoomForDisplay(axis) {
-      // zoom is internally handled logarithmically, because we want to have x0.5, x1, x2, x4 ... magnifications
-      // spaced out at regular intervals. When displaying, we need to convert that to non-logarithmic values.
-
-      return `${(Math.pow(2, this.zoom[axis]) * 100).toFixed()}%`
-    },
-    toggleZoomAr() {
-      this.zoomAspectRatioLocked = !this.zoomAspectRatioLocked;
-    },
-
-    resetZoom() {
-      // we store zoom logarithmically on this component
-      this.zoom = {x: 0, y: 0};
-
-      // we do not use logarithmic zoom elsewhere
-      // todo: replace eventBus with postMessage to parent
-      // this.eventBus.send('set-zoom', {zoom: 1, axis: 'y'});
-      // this.eventBus.send('set-zoom', {zoom: 1, axis: 'x'});
-
-      this.eventBus?.sendToTunnel('set-zoom', {zoom: 1, axis: 'y'});
-      this.eventBus?.sendToTunnel('set-zoom', {zoom: 1, axis: 'x'});
-    },
-    changeZoom(newZoom, axis) {
-      // we store zoom logarithmically on this compnent
-      if (!axis) {
-        this.zoom.x = newZoom;
-      } else {
-        this.zoom[axis] = newZoom;
-      }
-
-      // we do not use logarithmic zoom elsewhere, therefore we need to convert
-      newZoom = Math.pow(2, newZoom);
-
-      if (this.zoomAspectRatioLocked) {
-        this.eventBus?.sendToTunnel('set-zoom', {zoom: newZoom, axis: 'y'});
-        this.eventBus?.sendToTunnel('set-zoom', {zoom: newZoom, axis: 'x'});
-      } else {
-        this.eventBus?.sendToTunnel('set-zoom', {zoom: newZoom, axis: axis ?? 'x'});
-      }
-    },
-  }
-}
-
-</script>
-
-<style lang="scss" src="../../../../res/css/flex.scss" scoped></style>
-<style lang="scss" src="../../../res-common/panels.scss" scoped></style>
-<style lang="scss" src="../../../res-common/common.scss" scoped></style>

src/csui/src/PlayerUiPanels/PlayerDetectionPanel.vue

@@ -1,569 +0,0 @@
-<template>
-  <div class="flex flex-col tab-root">
-    <!-- ADD ANY OPTION BARS HERE -->
-
-    <!-- The rest of the tab -->
-    <div class="flex flex-row flex-wrap">
-
-      <!-- Player element picker -->
-      <div class="sub-panel">
-        <div class="flex flex-row">
-          <h1><mdicon name="television-play" :size="32" /> Player element</h1>
-        </div>
-        <div class="flex flex-row">
-          <div class="sub-panel-content">
-            <p>
-              You're probably on this page because Ultrawidify doesn't crop the player correctly.
-            </p>
-            <p>
-              If you hover over the boxes below, the corresponding element will change (sepia filter + higher brightness + reduced contrast + it gets an outline). Player element
-              should be the closest element to the video element, for which the sepia/brightness effect covers the area you expect the video will cover.
-            </p>
-            <p>
-              You need to reload the page for changes to take effect.
-            </p>
-
-            <!-- <p>
-              <a @click="showAdvancedOptions = !showAdvancedOptions">
-                <template v-if="showAdvancedOptions">Hide advanced options</template>
-                <template v-else>Show advanced options</template>
-              </a>
-            </p> -->
-
-            <div v-if="showAdvancedOptions" style="display: flex; flex-direction: row">
-              <div style="display: flex; flex-direction: column">
-                <div>
-                  <input :checked="playerManualQs"
-                          @change="togglePlayerManualQs"
-                          type="checkbox"
-                  />
-                  <div>
-                    Use <a href="https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors" target="_blank">CSS selector</a> for player<br/>
-                    <small>If defining multiple selectors, separate them with commas.</small>
-                  </div>
-                </div>
-                <div>Selector</div>
-                <input type="text"
-                  v-model="playerQs"
-                  @change="updatePlayerQuerySelector"
-                  @blur="updatePlayerQuerySelector"
-                  :disabled="playerByNodeIndex || !playerManualQs"
-                />
-              </div>
-              <div style="display: flex; flex-direction: column">
-                <b>Custom CSS for site</b>
-                <textarea></textarea>
-              </div>
-            </div>
-
-            <div style="display: flex; flex-direction: row;">
-              <div class="element-tree">
-                <table>
-                  <thead>
-                    <tr>
-                      <th>
-                        <div class="status-relative">
-                          Status <mdicon name="help-circle" @click="showLegend = !showLegend" />
-
-                          <div v-if="showLegend" class="element-symbol-legend">
-                            <b>Symbols:</b><br />
-                            <mdicon name="alert-remove" class="invalid" /> Element of invalid dimensions<br />
-                            <mdicon name="refresh-auto" class="auto-match" /> Ultrawidify's player detection thinks this should be the player<br />
-                            <mdicon name="bookmark" class="parent-offset-match" /> Site settings say this should be the player (based on counting parents)<br />
-                            <mdicon name="crosshairs" class="qs-match" /> Site settings say this should be the player (based on query selectors)<br />
-                            <mdicon name="check-circle" class="activePlayer" /> Element that is actually the player
-                          </div>
-                        </div>
-                      </th>
-                      <th>Element</th>
-                      <!-- <th>Actions</th> -->
-                      <!-- <th>Quick fixes</th> -->
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr
-                      v-for="(element, index) of elementStack"
-                      :key="index"
-                      class="element-row"
-                    >
-                      <td>
-                        <div class="status">
-                          <div
-                            v-if="element.heuristics?.invalidSize"
-                            class="invalid"
-                          >
-                            <mdicon name="alert-remove" />
-                          </div>
-                          <div
-                            v-if="element.heuristics?.autoMatch"
-                            class="auto-match"
-                          >
-                            <mdicon name="refresh-auto" />
-                          </div>
-                          <div
-                            v-if="element.heuristics?.qsMatch"
-                            class="qs-match"
-                          >
-                            <mdicon name="crosshairs" />
-                          </div>
-                          <div
-                            v-if="element.heuristics?.manualElementByParentIndex"
-                            class="parent-offset-match"
-                          >
-                            <mdicon name="bookmark" />
-                          </div>
-                          <div
-                            v-if="element.heuristics?.activePlayer"
-                            class="activePlayer"
-                          >
-                            <mdicon name="check-circle" />
-                          </div>
-                        </div>
-                      </td>
-                      <td>
-                        <div
-                          class="element-data"
-
-                          @mouseover="markElement(index, true)"
-                          @mouseleave="markElement(index, false)"
-
-                          @click="setPlayer(index)"
-                        >
-                          <div class="tag">
-                            <b>{{element.tagName}}</b> <i class="id">{{element.id ? `#`:''}}{{element.id}}</i>  @ <span class="dimensions">{{element.width}}</span>x<span class="dimensions">{{element.height}}</span>
-
-                          </div>
-                          <div v-if="element.classList" class="class-list">
-                            <div v-for="cls of element.classList" :key="cls">
-                              {{cls}}
-                            </div>
-                          </div>
-                        </div>
-                      </td>
-                      <td>
-                        <div class="flex flex-row">
-                          <!-- <div @click="designatePlayer(index)">Set as player {{ index }}</div> -->
-                        </div>
-                      </td>
-                      <!-- <td>
-                        <div
-                          class="css-fixes"
-                        >
-                          <div style="width: 100%"><b>Quick fixes:</b></div>
-                          <div
-                            class="css-line"
-                            :class="{'active': cssStack[index]?.includes('width: 100%;')}"
-                            @click="toggleCssForElement(index, 'width: 100%;')"
-                          >
-                            Width: 100%
-                          </div>
-                          <div
-                            class="css-line"
-                            :class="{'active': cssStack[index]?.includes('height: 100%;')}"
-                            @click="toggleCssForElement(index, 'height: 100%;')"
-                          >
-                            Height: 100%
-                          </div>
-                          <div
-                            class="css-line"
-                            :class="{'active': cssStack[index]?.includes('display: flex;')}"
-                            @click="toggleCssForElement(index, 'display: flex;')"
-                          >
-                            Display: flex
-                          </div>
-                          <div class="css-line">
-                            Flex direction:
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('flex-direction: row;')}"
-                              @click="toggleCssForElement(index, 'flex-direction', 'row')"
-                            >
-                              row
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('flex-direction: column;')}"
-                              @click="toggleCssForElement(index, 'flex-direction', 'column')"
-                            >
-                              column
-                            </span>
-                          </div>
-                          <div class="css-line">
-                            Justify content:
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('justify-content: start;')}"
-                              @click="toggleCssForElement(index, 'justify-content', 'start')"
-                            >
-                              start
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('justify-content: center;')}"
-                              @click="toggleCssForElement(index, 'justify-content', 'center')"
-                            >
-                              center
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('justify-content: end;')}"
-                              @click="toggleCssForElement(index, 'justify-content', 'end')"
-                            >
-                              end
-                            </span>
-                          </div>
-                          <div class="css-line">
-                            Align items:
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('align-items: start;')}"
-                              @click="toggleCssForElement(index, 'align-items', 'start')"
-                            >
-                              start
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('align-items: center;')}"
-                              @click="toggleCssForElement(index, 'align-items', 'center')"
-                            >
-                              center
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('align-items: end;')}"
-                              @click="toggleCssForElement(index, 'align-items', 'end')"
-                            >
-                              end
-                            </span>
-                          </div>
-
-                          <div class="css-line">
-                            Justify self:
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('justify-self: start;')}"
-                              @click="toggleCssForElement(index, 'justify-self', 'start')"
-                            >
-                              start
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('justify-self: center;')}"
-                              @click="toggleCssForElement(index, 'justify-self', 'center')"
-                            >
-                              center
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('justify-self: end;')}"
-                              @click="toggleCssForElement(index, 'justify-self', 'end')"
-                            >
-                              end
-                            </span>
-                          </div>
-                          <div class="css-line">
-                            Align self:
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('align-self: start;')}"
-                              @click="toggleCssForElement(index, 'align-self', 'start')"
-                            >
-                              start
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('align-self: center;')}"
-                              @click="toggleCssForElement(index, 'align-self', 'center')"
-                            >
-                              center
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('align-self: end;')}"
-                              @click="toggleCssForElement(index, 'align-self', 'end')"
-                            >
-                              end
-                            </span>
-                          </div>
-                          <div class="css-line">
-                            Text-align:
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('text-align: left;')}"
-                              @click="toggleCssForElement(index, 'text-align', 'left')"
-                            >
-                              left
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('text-align: center;')}"
-                              @click="toggleCssForElement(index, 'text-align', 'center')"
-                            >
-                              center
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.find(x => x.includes('text-align: right'))}"
-                              @click="toggleCssForElement(index, 'text-align', 'right')"
-                            >
-                              right
-                            </span>
-                          </div>
-                          <div class="css-line">
-                            Position:
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('position: relative;')}"
-                              @click="toggleCssForElement(index, 'position', 'relative')"
-                            >
-                              relative
-                            </span> |
-                            <span
-                              class="css-line-suboption"
-                              :class="{'active': cssStack[index]?.includes('position: absolute;')}"
-                              @click="toggleCssForElement(index, 'position', 'absolute')"
-                            >
-                              absolute
-                            </span>
-                          </div>
-                        </div>
-                      </td> -->
-                    </tr>
-                  </tbody>
-                </table>
-                <div class="element-config">
-                </div>
-              </div>
-
-              <!-- <div class="css-preview">
-                {{cssStack}}
-              </div> -->
-            </div>
-          </div>
-
-          <!-- <div class="sub-panel-content">
-            <h2>Advanced settings</h2>
-          </div> -->
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-
-
-export default({
-  components: {
-
-  },
-  data() {
-    return {
-      elementStack: [],
-      cssStack: [],
-      showLegend: false,
-      showAdvancedOptions: false,
-    };
-  },
-  mixins: [],
-  props: [
-    'siteSettings',
-    'frame',
-    'eventBus',
-    'site',
-    'isPopup'
-  ],
-  created() {
-    this.eventBus.subscribe('uw-config-broadcast', {function: (config) => this.handleElementStack(config)});
-  },
-  mounted() {
-    this.getPlayerTree();
-  },
-  computed: {},
-  methods: {
-    getPlayerTree() {
-      if (this.isPopup) {
-        this.eventBus.send('get-player-tree');
-      } else {
-        this.eventBus.sendToTunnel('get-player-tree');
-      }
-    },
-    handleElementStack(configBroadcast) {
-      if (configBroadcast.type === 'player-tree') {
-        this.elementStack = configBroadcast.config;
-        this.$nextTick( () => this.$forceUpdate() );
-      }
-    },
-    markElement(parentIndex, enable) {
-      this.eventBus.sendToTunnel('set-mark-element', {parentIndex, enable});
-    },
-    async setPlayer(index) {
-      // yup.
-      this.siteSettings.getDOMConfig('modified', 'original');
-      await this.siteSettings.setUpdateFlags(['PlayerData']);
-      await this.siteSettings.set('DOMConfig.modified.type', 'modified', {noSave: true});
-      await this.siteSettings.set('activeDOMConfig', 'modified', {noSave: true});
-
-      // if user agrees with ultrawidify on what element player should be,
-      // we just unset our settings for this site
-      if (this.elementStack[index].heuristics?.autoMatch) {
-        await this.siteSettings.set('DOMConfig.modified.elements.player.manual', false);
-        this.getPlayerTree();
-      } else {
-        // ensure settings exist:
-        await this.siteSettings.set('DOMConfig.modified.elements.player.manual', true, {noSave: true});
-        await this.siteSettings.set('DOMConfig.modified.elements.player.mode', 'index', {noSave: true});
-        await this.siteSettings.set('DOMConfig.modified.elements.player.index', index, true);
-        this.getPlayerTree();
-      }
-    },
-    /**
-     * Toggles active CSS for element of certain parent index.
-     * cssValue is optional and can be included in cssRule argument
-     */
-    toggleCssForElement(index, cssRule, cssValue) {
-      // we will handle elements that put cssValue as a separate argument elsewhere
-      if (cssValue) {
-        return this.toggleCssForElement_3arg(index,cssRule, cssValue);
-      }
-
-      // this rule applies to current element — remove it!
-      if (this.cssStack[index]?.includes(cssRule)) {
-        this.cssStack[index] = this.cssStack[index].filter(x => ! x.includes(cssRule));
-      } else {
-        if (!this.cssStack[index]) {
-          this.cssStack[index] = [];
-        }
-        this.cssStack[index].push(cssRule)
-      }
-
-      //TODO: update settings!
-    },
-    toggleCssForElement_3arg(index, cssRule, cssValue) {
-      const matching = this.cssStack[index]?.find(x => x.includes(cssRule))
-      if (matching) {
-        this.cssStack[index] = this.cssStack[index].filter(x => ! x.includes(cssRule));
-        if (!matching.includes(cssValue)) {
-          this.cssStack[index].push(`${cssRule}: ${cssValue};`);
-        }
-      } else {
-        if (!this.cssStack[index]) {
-          this.cssStack[index] = [];
-        }
-        this.cssStack[index].push(`${cssRule}: ${cssValue};`);
-      }
-
-      //TODO: update settings!
-    }
-  }
-})
-</script>
-
-<style lang="scss" scoped>
-p {
-  font-size: 1rem;
-}
-
-.element-tree {
-  .element-row {
-    // display: flex;
-    // flex-direction: row;
-    margin: 0.5rem;
-
-    .status {
-      width: 6.9rem;
-      margin-right: 1rem;
-      display: flex;
-      flex-direction: row;
-      justify-content: flex-end;
-      align-items: center;
-
-      .invalid {
-        color: #f00;
-      }
-    }
-    .element-data {
-      border: 1px solid rgba(255,255,255,0.5);
-      padding: 0.5rem 1rem;
-
-      max-width: 30rem;
-
-      display: flex;
-      flex-direction: column;
-
-      .tag {
-        text-transform: lowercase;
-        font-weight: bold;
-      }
-      .id {
-        font-style: italic;
-      }
-      .class-list {
-        font-style: italic;
-        opacity: 0.75;
-        font-size: 0.75rem;
-
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-
-        > div {
-          background-color: rgba(255,255,255,0.5);
-          border-radius: 0.25rem;
-          padding: 0.125rem 0.5rem;
-          margin: 0.125rem 0.25rem;
-        }
-      }
-      .dimensions {
-        color: #473c85;
-      }
-    }
-
-  }
-}
-
-// .css-fixes {
-//   // display: flex;
-//   // flex-direction: row;
-//   // flex-wrap: wrap;
-//   // align-items: flex-start;
-//   // justify-content:flex-start;
-// }
-.css-line {
-  display: inline-block;
-  flex-grow: 0;
-  flex-shrink: 0;
-  border: 1px solid rgba(255,255,255,0.5);
-  background: #000;
-  margin: 0.125rem 0.25rem;
-  padding: 0.125rem 0.25rem;
-
-  &.active, >span.active {
-    background: rgb(255, 174, 107);
-    color: #000;
-  }
-}
-
-.status-relative {
-  position: relative;
-
-  .element-symbol-legend {
-    position: absolute;
-    top: 100%;
-    left: 0;
-
-    z-index: 20000;
-
-    width: 32rem;
-
-    text-align: left;
-
-    background-color: #000;
-    padding: 1rem;
-    border: 1px solid rgba(255,255,255,0.5);
-  }
-}
-
-.tab-root {
-  width: 100%;
-}
-</style>

src/csui/src/PlayerUiPanels/PlayerUiSettings.vue

@@ -1,303 +0,0 @@
-<template>
-  <div class="flex flex-col" style="position: relative; width: 100%;">
-    <!-- The rest of the tab is under 'edit ratios and shortcuts' row -->
-    <div class="flex flex-col" style="width: 100%">
-      <h2>Player UI options</h2>
-
-      <div class="flex flex-col compact-form">
-        <div class="field">
-          <div class="label">Enable in-player UI</div>
-          <input
-            type="checkbox"
-            v-model="settings.active.ui.inPlayer.enabled"
-            @change="saveSettings()"
-          />
-        </div>
-        <div
-          class="flex flex-col field-group compact-form"
-          :class="{disabled: !settings.active.ui.inPlayer.enabled}"
-        >
-          <div class="field">
-            <div class="label">Enable only in full screen</div>
-            <input type="checkbox" v-model="settings.active.ui.inPlayer.enabledFullscreenOnly" />
-          </div>
-
-          <div class="field disabled">
-            <div class="label">
-              Popup activator position:
-            </div>
-            <div class="select">
-              <select
-                v-model="settings.active.ui.inPlayer.popupAlignment"
-                @change="saveSettings()"
-              >
-                <option value="left">Left</option>
-                <option value="right">Right</option>
-              </select>
-            </div>
-          </div>
-
-          <div class="field">
-            <div class="label">
-              Activate in-player UI:
-            </div>
-            <div class="select">
-              <select
-                v-model="settings.active.ui.inPlayer.activation"
-                @change="saveSettings()"
-              >
-                <option value="player">
-                  When mouse hovers over player
-                </option>
-                <option value="trigger-zone">
-                  When mouse hovers over trigger zone
-                </option>
-              </select>
-            </div>
-          </div>
-
-          <div class="field" :class="{'disabled': settings.active.ui.inPlayer.activation !== 'trigger-zone'}">
-            <div class="label">Edit trigger zone:</div>
-            <button @click="startTriggerZoneEdit()">Edit</button>
-          </div>
-
-          <div class="field">
-            <div class="label">
-              Do not show in-player UI when video player is narrower than (% of screen width)
-            </div>
-            <div class="input range-input">
-              <input
-                :value="settings.active.ui.inPlayer.minEnabledWidth"
-                class="slider"
-                type="range"
-                min="0"
-                max="1"
-                step="0.01"
-                @input="(event) => setPlayerRestrictions('minEnabledWidth', event.target.value)"
-                @change="(event) => saveSettings()"
-              >
-              <input
-                :value="ghettoComputed.minEnabledWidth"
-                @input="(event) => setPlayerRestrictions('minEnabledWidth', event.target.value, true)"
-                @change="(event) => saveSettings(true)"
-              >
-            </div>
-          </div>
-
-          <div class="field">
-            <div class="label">
-              Do not show in-player UI when video player is shorter than (% of screen width)
-            </div>
-            <div class="input range-input">
-              <input
-                :value="settings.active.ui.inPlayer.minEnabledHeight"
-                class="slider"
-                type="range"
-                min="0"
-                max="1"
-                step="0.01"
-                @input="(event) => setPlayerRestrictions('minEnabledHeight', event.target.value)"
-                @change="(event) => saveSettings()"
-              >
-              <input
-                :value="ghettoComputed.minEnabledHeight"
-                @input="(event) => setPlayerRestrictions('minEnabledHeight', event.target.value, true)"
-                @change="(event) => saveSettings(true)"
-              >
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <h2 class="mt2r">Menu options and keyboard shortcuts</h2>
-      <div>
-        Click 'add new' to add a new option. Click a button to edit or remove the keyboard shortcut.
-      </div>
-      <div class="keyboard-settings">
-        <!-- CROP OPTIONS -->
-        <div>
-          <div class="flex flex-row">
-            <h3 class="mth3">CROP OPTIONS</h3>
-          </div>
-
-          <CropOptionsPanel
-            :settings="settings"
-            :eventBus="eventBus"
-            :isEditing="true"
-          >
-          </CropOptionsPanel>
-        </div>
-
-        <!-- STRETCH OPTIONS -->
-        <div>
-          <div class="flex flex-row">
-            <h3 class="mth3">STRETCH OPTIONS</h3>
-          </div>
-
-          <StretchOptionsPanel
-            :settings="settings"
-            :eventBus="eventBus"
-            :isEditing="true"
-          ></StretchOptionsPanel>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</template>
-
-<script>
-import Button from '../components/Button.vue'
-import BrowserDetect from '../../../ext/conf/BrowserDetect';
-import CropOptionsPanel from './PanelComponents/VideoSettings/CropOptionsPanel.vue'
-import StretchOptionsPanel from './PanelComponents/VideoSettings/StretchOptionsPanel.vue'
-
-export default {
-  components: {
-    Button,
-    CropOptionsPanel,
-    StretchOptionsPanel
-  },
-  data() {
-    return {
-      ghettoComputed: { }
-    }
-  },
-  mixins: [
-  ],
-  props: [
-    'settings',      // required for buttons and actions, which are global
-    'eventBus',
-  ],
-  mounted() {
-    this.ghettoComputed = {
-      minEnabledWidth: this.optionalToFixed(this.settings.active.ui.inPlayer.minEnabledWidth * 100, 0),
-      minEnabledHeight: this.optionalToFixed(this.settings.active.ui.inPlayer.minEnabledHeight * 100, 0),
-    }
-  },
-  methods: {
-    forcePositiveNumber(value) {
-      //       Change EU format to US if needed
-      //                  |       remove everything after second period if necessary
-      //                  |               |            |   remove non-numeric characters
-      //                  |               |            |           |
-      return value.replaceAll(',', '.').split('.', 2).join('.').replace(/[^0-9.]/g, '');
-    },
-    optionalToFixed(v, n) {
-      if ((`${v}`.split('.')[1]?.length ?? 0) > n) {
-        return v.toFixed(n);
-      }
-      return v;
-    },
-    setPlayerRestrictions(key, value, isTextInput) {
-      if (isTextInput) {
-        value = (+this.forcePositiveNumber(value) / 100);
-      }
-      if (isNaN(+value)) {
-        value = 0.5;
-      }
-
-      this.settings.active.ui.inPlayer[key] = value;
-
-      if (isTextInput) {
-        this.ghettoComputed[key] = this.optionalToFixed(value, 0);
-      } else {
-        this.ghettoComputed[key] = this.optionalToFixed(value * 100, 0);
-      }
-    },
-    saveSettings(forceRefresh) {
-      this.settings.saveWithoutReload();
-
-      if (forceRefresh) {
-        this.$nextTick( () => this.$forceRefresh() );
-      }
-    },
-    startTriggerZoneEdit() {
-      this.eventBus.send('start-trigger-zone-edit');
-    },
-    async openOptionsPage() {
-      BrowserDetect.runtime.openOptionsPage();
-    },
-
-  }
-}
-</script>
-
-<style lang="scss" src="../../res/css/flex.scss" scoped module></style>
-<style lang="scss" src="../res-common/panels.scss" scoped module></style>
-<style lang="scss" src="../res-common/common.scss" scoped module></style>
-<style lang="scss" scoped>
-.justify-center {
-  justify-content: center;
-}
-.items-center {
-  align-items: center;
-}
-.mt-4{
-  margin-top: 1rem;
-}
-
-.input {
-  max-width: 24rem;
-}
-
-.range-input {
-  display: flex;
-  flex-direction: row;
-
-  * {
-    margin-left: 0.5rem;
-    margin-right: 0.5rem;
-  }
-
-
-  input {
-    max-width: 5rem;
-  }
-
-  input[type=range] {
-    max-width: none;
-  }
-}
-
-.trigger-zone-editor {
-  background-color: rgba(0,0,0,0.25);
-
-  padding-bottom: 2rem;
-  .field {
-    margin-bottom: -1em;
-  }
-}
-
-.disabled {
-  pointer-events: none;
-  /* color: #666; */
-  filter: contrast(50%) brightness(40%) grayscale(100%);
-}
-
-.compact-form {
-  > .field, > .field-group {
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-}
-
-.keyboard-settings {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  gap: 1rem;
-
-  > * {
-    width: calc(50% - 0.5rem);
-  }
-}
-
-.mt2r {
-  margin-top: 2rem;
-  margin-bottom: 0.5rem;
-}
-.mth3 {
-  margin-top: 1.5rem;
-}
-</style>

src/csui/src/PlayerUiPanels/ResetBackupPanel.vue

@@ -1,30 +0,0 @@
-<template>
-<div class="flex flex-col">
-  <h1>Reset and backup</h1>
-  <p>
-    Pressing the button will reset settings to default without asking.
-  </p>
-  <button
-    class="danger"
-    @click="resetSettings"
-  >
-    Reset settings
-  </button>
-</div>
-</template>
-<script>
-export default {
-  props: {
-    settings: Object
-  },
-  methods: {
-    resetSettings() {
-      this.settings.active = JSON.parse(JSON.stringify(this.settings.default));
-      this.settings.saveWithoutReload();
-    }
-  }
-}
-</script>
-<style lang="scss" src="../../res/css/flex.scss" scoped module></style>
-<style lang="scss" src="../res-common/panels.scss" scoped module></style>
-<style lang="scss" src="../res-common/common.scss" scoped module></style>

src/csui/src/PlayerUiPanels/ResizerDebugPanelComponent.vue

@@ -1,157 +0,0 @@
-<template>
-  <div class="panel-root">
-    <h1>Resizer debug data</h1>
-    <div class="flex flex-row flex-wrap">
-      <div class="panel">
-        <h3 class="panel-title">
-          Player info
-        </h3>
-        <div class="data-item">
-          <div class="data-title">Window size:
-            <small>(Inner size)</small>
-          </div>
-          <div class="data">{{windowWidth}} x {{windowHeight}}</div>
-          <div class="button" @click="refreshWindowSize()">
-            <!-- <Icon icon="arrow-clockwise"></Icon> -->
-            Refresh</div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">Player dimensions:</div>
-          <div class="data">{{debugData?.resizer?.playerData?.dimensions?.width ?? 'not detected'}} x {{debugData?.resizer?.playerData?.dimensions?.height ?? 'not detected'}}</div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">Is fullscreen?</div>
-          <div class="data">{{debugData?.resizer?.playerData?.dimensions?.fullscreen ?? 'unknown'}}</div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">Player id | classlist</div>
-          <div class="data">{{debugData?.resizer?.playerData?.elementId || '<no ID>'}} | {{debugData?.resizer?.playerData?.classList || '<no classes>'}}</div>
-        </div>
-      </div>
-
-        <!-- Stream info -->
-      <div class="panel">
-        <h3 class="panel-title">
-          Stream info
-        </h3>
-        <div class="data-item">
-          <div class="data-title">
-            Stream dimensions: <small>(Native size of the video)</small>
-          </div>
-          <div class="data">
-            {{debugData?.resizer?.videoRawData?.streamDimensions.x}} x {{debugData?.resizer?.videoRawData?.streamDimensions?.y}}
-          </div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">
-            Stream displayed dimensions: <small>(Video file is being upscaled to this size)</small>
-          </div>
-          <div class="data">
-            {{debugData?.resizer?.videoRawData?.displayedSize?.x.toFixed()}} x {{debugData?.resizer?.videoRawData?.displayedSize?.y.toFixed()}}
-          </div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">Video element native size: <small>(Size of the html element. Should be same as above most of the time!)</small></div>
-          <div class="data">{{debugData?.resizer?.videoRawData?.displayedSize?.x.toFixed(1)}} x {{debugData?.resizer?.videoRawData?.displayedSize?.y.toFixed(1)}}</div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">Size difference to player (raw): <small>(positive numbers: video element is bigger than player element)</small></div>
-          <div class="data">x: {{debugData?.resizer?.sizeDifferenceToPlayer?.beforeZoom?.wdiff.toFixed(1)}}; &nbsp; &nbsp; y: {{debugData?.resizer?.sizeDifferenceToPlayer?.beforeZoom?.hdiff.toFixed(1)}}</div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">Video element size (post zoom): <small>(Size of the html element after transform:scale is applied. Or at least, that's what Resizer::computeOffsets() thinks the final size is.)</small></div>
-          <div class="data">{{debugData?.resizer?.transformedSize?.x.toFixed(2)}} x {{debugData?.resizer?.transformedSize?.y.toFixed(2)}}</div>
-        </div>
-        <div class="data-item">
-          <div class="data-title"><b>Size difference to player (post-zoom):</b> <small>(same as above, except after cropping, stretching, panning and zoom are applied)</small></div>
-          <div class="data">x: {{debugData?.resizer?.sizeDifferenceToPlayer?.afterZoom?.wdiff.toFixed(2)}}; &nbsp; &nbsp; y: {{debugData?.resizer?.sizeDifferenceToPlayer?.afterZoom?.hdiff.toFixed(2)}}</div>
-        </div>
-      </div>
-
-      <!-- Transform info -->
-      <div class="panel">
-        <h3 class="panel-title">
-          Transformations
-        </h3>
-        <div class="data-item">
-          <div class="data-title">Alignment: <small>(I agree that 'left' and 'right' are both evil, but that's not the kind of alignments we're thinking of)</small></div>
-          <div class="data">{{debugData?.resizer?.videoTransform?.alignment || '<unknown>'}}</div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">Scale factor</div>
-          <div class="data">x: {{debugData?.resizer?.videoTransform?.scale.x.toFixed(2)}}; &nbsp; &nbsp; y: {{debugData?.resizer?.videoTransform?.scale.y.toFixed(2)}}</div>
-        </div>
-        <div class="data-item">
-          <div class="data-title">Translation</div>
-          <div class="data">x: {{debugData?.resizer?.videoTransform?.translate.x.toFixed(2)}}; &nbsp; &nbsp; y: {{debugData?.resizer?.videoTransform?.translate.y.toFixed(2)}}</div>
-        </div>
-      </div>
-    </div>
-      <!-- <div class="uw-debug-info flex"> -->
-        <!-- <pre> -->
-          <!-- {{debugDataPrettified}} -->
-        <!-- </pre> -->
-      <!-- </div> -->
-  </div>
-</template>
-
-<script>
-// import Icon from '../../common/components/Icon';
-
-export default {
-  components: {
-    // Icon,
-  },
-  props: {
-    debugData: Object
-  },
-  data() {
-    return {
-      windowWidth: window.innerWidth,
-      windowHeight: window.innerHeight
-    };
-  },
-  methods: {
-    refreshWindowSize() {
-      this.windowWidth = window.innerWidth;
-      this.windowHeight = window.innerHeight;
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '../../../res/css/uwui-base.scss';
-@import '../../../res/css/colors.scss';
-@import '../../../res/css/font/overpass.css';
-@import '../../../res/css/font/overpass-mono.css';
-@import '../../../res/css/common.scss';
-
-.panel-root {
-  display: block;
-  padding: 16px;
-}
-
-.panel {
-  display: inline-block;
-  width: 420px;
-  max-width: 100%;
-  padding: 12px 6px;
-}
-
-.data-item {
-  display: block;
-  margin-bottom: 0.69rem;
-}
-
-.data-title {
-
-  small {
-    display: block;
-    opacity: 0.69;
-  }
-}
-.data {
-  color: $primary-color;
-  }
-</style>

src/csui/src/PlayerUiPanels/SiteSettings.vue

@@ -1,9 +0,0 @@
-<template>
-  <div class="flex flex-col">
-
-
-    <div class="">
-
-    </div>
-  </div>
-</template>

src/csui/src/PlayerUiPanels/VideoSettings.vue

@@ -1,192 +0,0 @@
-<template>
-  <div class="flex flex-col" style="position: relative; width: 100%;">
-    <!-- 'Change UI' options is a tiny bit in upper right corner. -->
-    <div
-      class="options-bar flex flex-row"
-      :class="{isEditing: editMode}"
-    >
-      <template v-if="editMode">
-        <div style="height: 100%; display: flex; flex-direction: column; justify-content: center; flex: 0 0; padding-right: 8px;">
-          <mdicon name="alert" size="32" />
-        </div>
-        <div class="flex-grow">
-          You are currently editing options and shortcuts.<br/>
-          <b>NOTE: changes will take effect after page reload.</b>
-        </div>
-        <div
-          class="flex-nogrow flex-noshrink"
-          @click="editMode = !editMode"
-        >
-          Exit edit mode
-        </div>
-      </template>
-      <template v-else>
-        <div class="flex-grow"></div>
-        <div
-          class=""
-          @click="editMode = !editMode"
-        >
-          Edit ratios and shortcuts
-        </div>
-      </template>
-    </div>
-
-    <!-- The rest of the tab is under 'edit ratios and shortcuts' row -->
-    <div class="flex flex-row flex-wrap" style="width: 100%">
-
-      <div class="flex flex-col">
-        <!-- CROP OPTIONS -->
-        <div v-if="settings" class="sub-panel">
-          <div class="flex flex-row">
-            <mdicon name="crop" :size="32" />
-            <h1>Crop video:</h1>
-          </div>
-
-          <CropOptionsPanel
-            :settings="settings"
-            :siteSettings="siteSettings"
-            :eventBus="eventBus"
-            :isEditing="editMode"
-          >
-          </CropOptionsPanel>
-        </div>
-
-        <!-- STRETCH OPTIONS -->
-        <div v-if="settings" class="sub-panel">
-          <div class="flex flex-row">
-            <mdicon name="stretch-to-page-outline" :size="32" />
-            <h1>Stretch video:</h1>
-          </div>
-
-          <StretchOptionsPanel
-            :settings="settings"
-            :siteSettings="siteSettings"
-            :eventBus="eventBus"
-            :isEditing="editMode"
-          ></StretchOptionsPanel>
-        </div>
-      </div>
-
-      <div class="flex flex-col">
-
-        <!-- VIDEO ALIGNMENT -->
-        <div class="sub-panel">
-          <div class="flex flex-row">
-            <mdicon name="align-horizontal-center" :size="32" />
-            <h1>Video alignment:</h1>
-          </div>
-
-          <div class="flex flex-row justify-center mt-4">
-            <alignment-options-control-component
-              :eventBus="eventBus"
-            >
-            </alignment-options-control-component>
-          </div>
-
-          <!-- <div class="flex flex-row flex-wrap">
-            <div class="m-t-0-33em display-block">
-              <input id="_input_zoom_site_allow_pan"
-                      type="checkbox"
-                      />
-              Pan with mouse
-            </div>
-          </div> -->
-        </div>
-
-        <!-- ZOOM OPTIONS -->
-        <!-- <div class="sub-panel">
-          <div class="flex flex-row">
-            <mdicon name="magnify-plus-outline" :size="32" />
-            <h1>Manual zoom:</h1>
-          </div>
-
-          <ZoomOptionsPanel
-            :settings="settings"
-            :siteSettings="siteSettings"
-            :eventBus="eventBus"
-            :isEditing="editMode"
-          ></ZoomOptionsPanel>
-        </div> -->
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import ZoomOptionsPanel from './PanelComponents/VideoSettings/ZoomOptionsPanel.vue'
-import CropOptionsPanel from './PanelComponents/VideoSettings/CropOptionsPanel'
-import StretchOptionsPanel from './PanelComponents/VideoSettings/StretchOptionsPanel'
-import Button from '../components/Button.vue'
-import ShortcutButton from '../components/ShortcutButton';
-import EditShortcutButton from '../components/EditShortcutButton';
-import ComputeActionsMixin from '../mixins/ComputeActionsMixin';
-import BrowserDetect from '../../../ext/conf/BrowserDetect';
-import AlignmentOptionsControlComponent from './AlignmentOptionsControlComponent.vue';
-import CommsMixin from '../utils/CommsMixin';
-
-export default {
-  data() {
-    return {
-      exec: null,
-      scope: 'page',
-
-      editMode: false,
-
-      resizerConfig: {
-        crop: null,
-        stretch: null,
-        zoom: null,
-        pan: null
-      }
-    }
-  },
-  mixins: [
-    ComputeActionsMixin,
-    CommsMixin,
-  ],
-  props: [
-    'settings',      // required for buttons and actions, which are global
-    'siteSettings',
-    'frame',
-    'eventBus',
-    'site'
-  ],
-  created() {
-    this.eventBus.subscribe('uw-config-broadcast', {function: (config) => this.handleConfigBroadcast(config)});
-  },
-  mounted() {
-    this.eventBus.sendToTunnel('get-ar');
-  },
-  components: {
-    ShortcutButton,
-    EditShortcutButton,
-    Button,
-    AlignmentOptionsControlComponent,
-    StretchOptionsPanel,
-    CropOptionsPanel, ZoomOptionsPanel
-  },
-  methods: {
-
-    async openOptionsPage() {
-      BrowserDetect.runtime.openOptionsPage();
-    },
-
-  }
-}
-</script>
-
-<style lang="scss" src="../../res/css/flex.scss" scoped module></style>
-<style lang="scss" src="../res-common/panels.scss" scoped module></style>
-<style lang="scss" src="../res-common/common.scss" scoped module></style>
-<style lang="scss" scoped>
-.justify-center {
-  justify-content: center;
-}
-.items-center {
-  align-items: center;
-}
-.mt-4{
-  margin-top: 1rem;
-}
-</style>

src/csui/src/components/AardStatusIndicator.vue

@@ -1,17 +0,0 @@
-<template>
-  <div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    siteSettings: Object,
-    hasDrm: Boolean,
-    problems: Object,
-  }
-}
-</script>
-
-<style lang="scss">
-</style>

src/csui/src/components/Button.vue

@@ -1,43 +0,0 @@
-<template>
-  <div class="button center-text"
-       :class="{'setting-selected': selected }"
-  >
-    <div class="label">
-      {{label}}
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    fixedWidth: Boolean,
-    selected: Boolean,
-    label: String,
-    icon: String,
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.button {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: none;
-
-  align-items: center;
-
-  .icon {
-    margin-right: 8px;
-    flex-grow: 0;
-    flex-shrink: 0;
-  }
-
-  .label {
-    text-align: center;
-    flex-grow: 1;
-    flex-shrink: 1;
-  }
-
-}
-</style>

src/csui/src/components/EditShortcutButton.vue

@@ -1,191 +0,0 @@
-<template>
-  <div class="flex flex-row">
-    <div
-      class="flex-grow button"
-      @click="editShortcut()"
-
-    >
-      <template v-if="!editing">
-        {{shortcutDisplay}}
-      </template>
-      <template v-else>
-        {{currentKeypress ?? 'Press a key'}}
-        <input ref="input"
-          class="hidden-input"
-          @keyup.capture="keyup($event)"
-          @keydown.capture="keydown($event)"
-          @input.prevent=""
-          @blur="editing = false;"
-        >
-      </template>
-    </div>
-    <div class="button" @click="$emit('shortcutChanged', null)">
-      <mdicon name="delete"></mdicon>
-    </div>
-  </div>
-</template>
-
-<script>
-import KeyboardShortcutParser from '../../../common/js/KeyboardShortcutParser';
-
-export default {
-  props: {
-    shortcut: Object,
-  },
-  data() {
-    return {
-      currentKeypress: undefined,
-      currentKey: undefined,
-      editing: false,
-    }
-  },
-  computed: {
-    shortcutDisplay() {
-      if (!this.shortcut) {
-        return '(no shortcut)'
-      }
-      return KeyboardShortcutParser.parseShortcut(this.shortcut);
-    }
-  },
-  methods: {
-    editShortcut() {
-      this.editing = true;
-      this.currentKeypress = undefined;
-      this.currentKey = undefined;
-
-      // input doesn't exist now, but will exist on the next tick
-      this.$nextTick(()=> this.$refs.input.focus());
-    },
-    /**
-     * Updates currently pressed keypress for display
-     */
-    keydown(event) {
-      // event.repeat is set to 'true' when key is being held down, but not on
-      // first keydown. We don't need to process subsequent repeats of a keypress
-      // we already processed.
-      if (event.repeat) {
-        return;
-      }
-
-      const shortcut = KeyboardShortcutParser.generateShortcutFromKeypress(event);
-      const fixedShortcut = this.handleModifierKeypress(shortcut);
-
-      if (this.currentKey === undefined) {
-        this.currentKey = fixedShortcut;
-      } else {
-        // here's a fun fact. Keydown doesn't do modifier keys the way we want —
-        // notably, A-Z0-9 keys are returned without modifier state (all modifiers)
-        // are set to false in keydown events. That means we need to keep track of
-        // modifiers ourselves.
-        if (fixedShortcut.notModifier) {
-          this.currentKey.key = fixedShortcut.key;
-          this.currentKey.code = fixedShortcut.code;
-        } else {
-          this.currentKey = {
-            ...fixedShortcut,
-            key: this.currentKey.key,
-            code: this.currentKey.code
-          }
-        }
-      }
-
-      // update display
-      this.currentKeypress = KeyboardShortcutParser.parseShortcut(this.currentKey);
-    },
-    /**
-     * Emits shortcutChanged when shortcut is considered changed
-     */
-    keyup(event) {
-      const shortcut = KeyboardShortcutParser.generateShortcutFromKeypress(event);
-      const fixedShortcut = this.handleModifierKeypress(shortcut);
-
-      if (fixedShortcut.notModifier) {
-        this.editing = false;
-        this.$emit('shortcutChanged', this.currentKey);
-      } else {
-        // if none of the modifiers are pressed and if no other key is being held down,
-        // we need to reset label back to 'pls press key'
-        if (!fixedShortcut.altKey && !fixedShortcut.ctrlKey && !fixedShortcut.metaKey && !fixedShortcut.shiftKey && !fixedShortcut.code) {
-          this.currentKeypress = undefined;
-          this.currentKey = undefined;
-        } else {
-          this.currentKey = shortcut;
-          this.currentKeypress = KeyboardShortcutParser.parseShortcut(this.currentKey);
-        }
-      }
-    },
-
-    /**
-     * Handles current keypress if event.keyCode is a modifier key.
-     * Returns true if current event was a modifier key, false if
-     * if was a regular A-Z 0-9 key.
-     */
-    handleModifierKeypress(event) {
-      const modifierPressed = event.type === 'keydown';
-
-      switch (event.code) {
-          case 'ShiftLeft':
-          case 'ShiftRight':
-            return {
-              ...event,
-              key: '…',
-              code: null,
-              shiftKey: modifierPressed
-            }
-          case 'ControlLeft':
-          case 'ControlRight':
-            return {
-              ...event,
-              key: '…',
-              code: null,
-              controlKey: modifierPressed
-            };
-          case 'MetaLeft':
-          case 'MetaRight':
-            return {
-              ...event,
-              key: '…',
-              code: null,
-              metaKey: modifierPressed
-            };
-          case 'AltLeft':
-          case 'AltRight':
-            return {
-              ...event,
-              key: '…',
-              code: null,
-              altKey: modifierPressed
-            };
-        }
-
-        return {
-          ...event,
-          notModifier: true,
-        }
-    }
-
-  }
-}
-
-
-
-
-</script>
-
-<style lang="scss" src="../res-common/common.scss" scoped></style>
-<style lang="scss" scoped>
-@import "../res-common/variables";
-
-.center-text {
-  text-align: center;
-}
-.dark {
-  opacity: 50%;
-}
-
-.hidden-input {
-  position: absolute;
-  z-index: -9999;
-  opacity: 0;
-}
-</style>

src/csui/src/components/GhettoContextMenu.vue

@@ -1,118 +0,0 @@
-<template>
-  <div class="context-container" @mouseleave="hideContextMenu()">
-    <GhettoContextMenuItem
-      class="activator uw-clickable"
-      :css="{
-        'expand-left': alignment === 'left',
-        'expand-right': alignment === 'right',
-      }"
-      @click="showContextMenu()"
-      @mouseenter="showContextMenu()"
-    >
-      <slot name="activator"></slot>
-    </GhettoContextMenuItem>
-    <div
-      v-if="contextMenuVisible"
-      class="context-menu uw-clickable"
-      :class="{
-        'menu-left': alignment === 'left',
-        'menu-right': alignment === 'right'
-      }"
-      @mouseleave="hideContextMenu()"
-    >
-      <slot></slot>
-    </div>
-  </div>
-
-</template>
-<script>
-import GhettoContextMenuItem from './GhettoContextMenuItem.vue';
-
-export default {
-  components: {
-    GhettoContextMenuItem,
-  },
-  props: {
-    alignment: String,
-  },
-  data() {
-    return {
-      contextMenuVisible: false,
-      contextMenuHideTimeout: undefined,
-    }
-  },
-  methods: {
-    showContextMenu() {
-      this.contextMenuVisible = true;
-    },
-    hideContextMenu() {
-      this.contextMenuHideTimeout = setTimeout( () => {
-        this.contextMenuVisible = false;
-      }, 50);
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.context-container {
-  position: relative;
-}
-.context-menu-wrapper {
-  position: relative;
-}
-.context-menu {
-  position: absolute;
-  display: flex;
-  flex-direction: column;
-  min-width: 5rem;
-
-  top: 50%;
-  transform: translateY(-50%);
-}
-.menu-left {
-  right: 100%;
-}
-.menu-right {
-  left: 100%;
-}
-</style>
-<style lang="scss">
-.activator {
-  position: relative;
-  padding: 1rem 1.6rem;
-
-  font-size: .95rem;
-  padding: 1rem 1.6rem;
-  background-color: rgba(0, 0, 0, 0.5);
-  backdrop-filter: blur(16px) saturate(120%);
-
-  white-space: nowrap;
-  &:hover {
-    background-color: rgba(255, 128, 64, 0.5);
-  }
-
-  &.expand-left {
-    padding-left: 2.2rem;
-  }
-  &.expand-right {
-    padding-right: 2.2rem;
-  }
-
-  &.expand-left::before,
-  &.expand-right::after {
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    font-size: 0.88rem;
-  }
-
-  &.expand-left::before {
-    content: '⮜';
-    left: 0.5rem;
-  }
-  &.expand-right::after {
-    content: '⮞';
-    right: 0.5rem;
-  }
-}
-</style>

src/csui/src/components/GhettoContextMenuItem.vue

@@ -1,45 +0,0 @@
-<template>
-  <div
-    class="flex flex-col flex-center center-text item"
-    :class="{
-      'can-hover': !disableHover,
-      ...(css ? css : {}),
-    }"
-  >
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    label: String,
-    shortcut: String,
-    childAlignment: String,
-    css: Object,
-    disableHover: Boolean,
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.item {
-  font-size: .95rem;
-  font-family: 'Overpass';
-  padding: 1rem 1.6rem;
-  background-color: rgba(0, 0, 0, 0.5);
-  backdrop-filter: blur(16px) saturate(120%);
-
-  white-space: nowrap;
-
-  &.can-hover:hover {
-    background-color: rgba(0,0,0,0.8);
-    border-bottom: 1px solid #fa6;
-  }
-
-  display: flex;
-  flex-direction: column;
-}
-
-
-</style>