From 2bfa3e8dfcc24e3b7d8f63569cb6cf41652aad0e Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Fri, 7 Jun 2019 01:50:13 +0200
Subject: [PATCH] Site settings: allow user to select a site

---
 src/ext/conf/ExtensionConf.js          | 20 +++++++++++
 src/ext/lib/video-transform/Resizer.js |  4 +--
 src/popup/App.vue                      | 49 +++++++++++++++++++++++---
 3 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/src/ext/conf/ExtensionConf.js b/src/ext/conf/ExtensionConf.js
index 76c0802..291d5d1 100644
--- a/src/ext/conf/ExtensionConf.js
+++ b/src/ext/conf/ExtensionConf.js
@@ -919,6 +919,26 @@ var ExtensionConf = {
         }
       }
     },
+    "old.reddit.com" : {
+      mode: ExtensionMode.Enabled,
+      autoar: currentBrowser.firefox ? ExtensionMode.Enabled : ExtensionMode.Disabled,     
+      override: false,
+      type: 'official',
+      stretch: Stretch.Default,
+      videoAlignment: VideoAlignment.Default,
+      keyboardShortcutsEnabled: ExtensionMode.Default,
+      // videoElement: {        // extra stuff for video tag
+      //   querySelectors: [],    // array of strings with css selectors
+      //   userCss: [],         // additional styles that user can define for video element
+      // },
+      playerElement: {
+        // querySelectors: [],    // array of strings with css selectors
+        videoAncestor: 1,       // if not falsey, the number represents how far up the DOM (in nodes)
+                                // from video the player lies. Can also be object (valid properties are
+                                // 'fullscreen', 'embed' and 'normal')
+        userCss: [],
+      }
+    },
   }
 }
 
diff --git a/src/ext/lib/video-transform/Resizer.js b/src/ext/lib/video-transform/Resizer.js
index 8fecf5f..f5cba16 100644
--- a/src/ext/lib/video-transform/Resizer.js
+++ b/src/ext/lib/video-transform/Resizer.js
@@ -511,7 +511,7 @@ class Resizer {
       }
     }
 
-    if(Debug.debug) {
+    // if(Debug.debug) {
       console.log("[Resizer::_res_computeOffsets] <rid:"+this.resizerId+"> calculated offsets:\n\n",
       '---- data in ----\n',
       'player dimensions:', {w: this.conf.player.dimensions.width, h: this.conf.player.dimensions.height},
@@ -520,7 +520,7 @@ class Resizer {
       'pan & zoom:       ', this.pan, this.zoom,
       '\n\n---- data out ----\n',
       'translate:', translate);
-    }
+    // }
 
     return translate; 
   }
diff --git a/src/popup/App.vue b/src/popup/App.vue
index 8f8d4e5..3e19d41 100644
--- a/src/popup/App.vue
+++ b/src/popup/App.vue
@@ -24,7 +24,20 @@
           <div class="">
             Site settings
           </div>
-          <div class="">
+          <div v-if="selectedTab === 'site' && this.activeFrames.length > 1"
+               class=""
+          >
+            <small>Select site to control:</small>
+            <div class="">
+              <div v-for="site of activeSites"
+                  :key="site.host"
+                  class="tabitem"
+                  :class="{'tabitem-selected': site.host === selectedSite}"
+                  @click="selectSite(site.host)"
+              >
+                {{site.host}}
+              </div>
+            </div>
           </div>
         </div>
         <div class="menu-item"
@@ -86,7 +99,7 @@
                               class=""
                               :settings="settings"
                               :scope="selectedTab"
-                              :site="site && site.host"
+                              :site="selectedSite"
         />
         <PerformancePanel v-if="selectedTab === 'performance-metrics'" 
                           :performance="performance" />
@@ -114,7 +127,9 @@ export default {
     return {
       selectedTab: 'video',
       selectedFrame: '__all',
+      selectedSite: '',
       activeFrames: [],
+      activeSites: [],
       port: BrowserDetect.firefox ? browser.runtime.connect({name: 'popup-port'}) : chrome.runtime.connect({name: 'popup-port'}),
       comms: new Comms(),
       frameStore: {},
@@ -207,6 +222,18 @@ export default {
           this.port.postMessage({cmd: 'get-current-zoom'});
         }
         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 = message.site.host.host;
+
+
         // loadConfig(site.host); TODO
         this.loadFrames(this.site);
       } else if (message.cmd === 'set-current-zoom') {
@@ -225,8 +252,6 @@ export default {
         // selectedSubitemLoaded = true;
       }
 
-      this.activeFrames = [];
-
       if (videoTab.frames.length < 2 || Object.keys(videoTab.frames).length < 2) {
         this.selectedFrame = '__all';
         return;
@@ -253,6 +278,11 @@ export default {
       }
 
       this.activeFrames = [{id: '__all', label: 'All'},{id: '__playing', label: 'Currently playing'}];
+      this.activeSites = [{
+        host: this.site.host,
+        isIFrame: false,  // not used tho. Maybe one day
+      }];
+      this.selectedSite = this.site.host;
 
       for (const frame in videoTab.frames) {
         this.activeFrames.push({
@@ -260,6 +290,14 @@ export default {
           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
+          });
+        }
       }
     },
     getRandomColor() {
@@ -273,6 +311,9 @@ export default {
     },
     selectFrame(id){
       this.selectedFrame = id;
+    },
+    selectSite(host) {
+      this.selectedSite = host;
     }
   }
 }