From a9ab8d8b92b5075893eaada9d0b0f0f9c0f1b4b7 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Fri, 12 Mar 2021 00:14:52 +0100
Subject: [PATCH] okay what the actual fuck

---
 .../{ExtensionActionButtonApp.vue => App.vue} | 80 ++++++++++++-------
 src/popup/Popup.ts                            | 10 ---
 src/popup/js/{ExecAction.ts => PopupExec.ts}  |  6 +-
 src/popup/panels/VideoPanel.vue               |  4 +-
 src/popup/popup.js                            |  5 +-
 5 files changed, 59 insertions(+), 46 deletions(-)
 rename src/popup/{ExtensionActionButtonApp.vue => App.vue} (91%)
 delete mode 100644 src/popup/Popup.ts
 rename src/popup/js/{ExecAction.ts => PopupExec.ts} (95%)

diff --git a/src/popup/ExtensionActionButtonApp.vue b/src/popup/App.vue
similarity index 91%
rename from src/popup/ExtensionActionButtonApp.vue
rename to src/popup/App.vue
index 6922723..cb591e7 100644
--- a/src/popup/ExtensionActionButtonApp.vue
+++ b/src/popup/App.vue
@@ -195,8 +195,8 @@
                               :settings="settings"
                               :site="selectedSite"
         />
-        <!-- <PerformancePanel v-if="selectedTab === 'performance-metrics'" 
-                          :performance="performance" /> -->
+        <PerformancePanel v-if="selectedTab === 'performance-metrics'" 
+                          :performance="performance" />
         <WhatsNewPanel v-if="selectedTab === 'whats-new'" />
         <AboutPanel v-if="selectedTab === 'about'" />
         <Donate v-if="selectedTab === 'donate'" />
@@ -206,22 +206,38 @@
 </template>
 
 <script lang="ts">
-
+import Icon from '../common/components/Icon.vue'
+import WhatsNewPanel from './panels/WhatsNewPanel.vue';
+import SiteDetailsPanel from './panels/SiteDetailsPanel.vue';
+import Donate from '../common/misc/Donate.vue';
+import Debug from '../ext/conf/Debug';
+import BrowserDetect from '../ext/conf/BrowserDetect';
+import Comms from '../ext/lib/comms/Comms';
+import VideoPanel from './panels/VideoPanel';
+import PerformancePanel from './panels/PerformancePanel';
+import Settings from '../ext/lib/Settings';
+import PopupExec from './js/PopupExec';
+import DefaultSettingsPanel from './panels/DefaultSettingsPanel';
+import AboutPanel from './panels/AboutPanel';
+import ExtensionMode from '../common/enums/ExtensionMode.enum';
+import Logger from '../ext/lib/Logger';
+import {ChromeShittinessMitigations as CSM} from '../common/js/ChromeShittinessMitigations';
 
 export default Vue.extend({
-   data () {
+  data () {
     return {
       selectedTab: 'video',
       selectedFrame: '__all',
       selectedSite: '',
       activeFrames: [],
       activeSites: [],
+      comms: new Comms(),
       frameStore: {},
       frameStoreCount: 0,
       performance: {},
       site: null,
       currentZoom: 1,
-      execAction: new ExecAction(null, null),
+      execAction: new PopupExec(null, null),
       settings: {},
       settingsInitialized: false,
       logger: {},
@@ -244,10 +260,9 @@ export default Vue.extend({
     await this.settings.init();
     this.settingsInitialized = true;
 
-    const port = browser.runtime.connect(null, {name: 'popup-port'});
-    // port.onMessage.addListener( (m,p) => this.processReceivedMessage(m,p));
-
-    // CSM.setProperty('port', port);
+    const port = BrowserDetect.firefox ? browser.runtime.connect({name: 'popup-port'}) : chrome.runtime.connect({name: 'popup-port'});
+    port.onMessage.addListener( (m,p) => this.processReceivedMessage(m,p));
+    CSM.setProperty('port', port);
 
     this.execAction.setSettings(this.settings);
 
@@ -257,12 +272,12 @@ export default Vue.extend({
         cmd: 'unmark-player',
         forwardToAll: true,
       });
-      // if (BrowserDetect.anyChromium) {
-      //   chrome.extension.getBackgroundPage().sendUnmarkPlayer({
-      //     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
@@ -292,6 +307,7 @@ export default Vue.extend({
   components: {
     VideoPanel,
     DefaultSettingsPanel,
+    PerformancePanel,
     Debug,
     BrowserDetect,
     AboutPanel,
@@ -302,7 +318,7 @@ export default Vue.extend({
   },
   methods: {
     async sleep(t) {
-      return new Promise<void>( (resolve,reject) => {
+      return new Promise( (resolve,reject) => {
         setTimeout(() => resolve(), t);
       });
     },
@@ -317,6 +333,20 @@ export default Vue.extend({
         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;
+      if (tab === 'whats-new') {
+        this.settings.active.whatsNewChecked = true;
+        this.settings.save();
+      }
+      this.toggleSideMenu(false);
+    },
+    selectFrame(frame) {
+      this.selectedFrame = frame;
+    },
     async updateConfig() {
       // when this runs, a site could have been enabled or disabled
       // this means we must update canShowVideoTab
@@ -357,7 +387,7 @@ export default Vue.extend({
         if (this.site) {
           if (!this.site.host) {
             // dunno why this fix is needed, but sometimes it is
-            this.site.host = message.site.tabHostname;
+            this.site.host = site.tabHostname;
           }
         }
         if (!this.site || this.site.host !== message.site.host) {
@@ -499,7 +529,7 @@ export default Vue.extend({
       // update whether video tab can be shown
       this.updateCanShowVideoTab();
     },
-    getRandomColor(): string {
+    getRandomColor() {
       return `rgb(${Math.floor(Math.random() * 128)}, ${Math.floor(Math.random() * 128)}, ${Math.floor(Math.random() * 128)})`;
     },
     setCurrentZoom(nz) {
@@ -508,16 +538,8 @@ export default Vue.extend({
     updateZoom(nz){
       this.currentZoom = nz;
     },
-    selectTab(tab) {
-      this.selectedTab = tab;
-      if (tab === 'whats-new') {
-        this.settings.active.whatsNewChecked = true;
-        this.settings.save();
-      }
-      this.toggleSideMenu(false);
-    },
-    selectFrame(frame) {
-      this.selectedFrame = frame;
+    selectFrame(id){
+      this.selectedFrame = id;
     },
     selectSite(host) {
       this.selectedSite = host;
@@ -526,7 +548,7 @@ export default Vue.extend({
       this.sideMenuVisible = visible ?? !this.sideMenuVisible;
     }
   }
-})
+});
 </script>
 
 <style src="../res/css/font/overpass.css"></style>
diff --git a/src/popup/Popup.ts b/src/popup/Popup.ts
deleted file mode 100644
index 76694ba..0000000
--- a/src/popup/Popup.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createApp } from 'vue'
-import App from './ExtensionActionButtonApp.vue';
-
-class Popup {
-  static createApp() {
-    createApp(App).mount('#app');
-  }
-}
-
-export default Popup;
\ No newline at end of file
diff --git a/src/popup/js/ExecAction.ts b/src/popup/js/PopupExec.ts
similarity index 95%
rename from src/popup/js/ExecAction.ts
rename to src/popup/js/PopupExec.ts
index 3b5f31f..020f249 100644
--- a/src/popup/js/ExecAction.ts
+++ b/src/popup/js/PopupExec.ts
@@ -1,7 +1,7 @@
-import { browser } from '../../../node_modules/webextension-polyfill-ts/lib/index';
+import { browser } from 'webextension-polyfill-ts';
 import Settings from '../../ext/lib/Settings';
 
-class ExecAction {
+class PopupExec {
   settings: Settings;
   site: any;
   
@@ -82,4 +82,4 @@ class ExecAction {
   }
 }
 
-export default ExecAction;
+export default PopupExec;
diff --git a/src/popup/panels/VideoPanel.vue b/src/popup/panels/VideoPanel.vue
index 175b3cf..ea36e3b 100644
--- a/src/popup/panels/VideoPanel.vue
+++ b/src/popup/panels/VideoPanel.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script>
-import ExecAction from '../js/ExecAction';
+import PopupExec from '../js/PopupExec';
 import KeyboardShortcutParser from '../../common/js/KeyboardShortcutParser';
 import ShortcutButton from '../../common/components/ShortcutButton';
 import ComputeActionsMixin from '../../common/mixins/ComputeActionsMixin';
@@ -145,7 +145,7 @@ export default {
     'cropModePersistence',
   ],
   created() {
-    this.exec = new ExecAction(this.settings);
+    this.exec = new PopupExec(this.settings);
   },
   components: {
     ShortcutButton,
diff --git a/src/popup/popup.js b/src/popup/popup.js
index 905e90c..d928927 100644
--- a/src/popup/popup.js
+++ b/src/popup/popup.js
@@ -1,3 +1,4 @@
-import Popup from './Popup';
+import { createApp } from 'vue'
+import App from './App';
 
-Popup.createApp();
+createApp(App).mount('#app');