Updating settings backthing stuff for new popup

js/conf/ExtensionConf.js

@@ -97,7 +97,11 @@ var ExtensionConf = {
     samenessTreshold: 0.025,  // if aspect ratios are within 2.5% within each other, don't resize
   },
   miscFullscreenSettings: {
-    videoFloat: "center"
+    videoFloat: "center",
+    mousePan: {
+      enabled: false
+    },
+    defaultAr: "original",
   },
   stretch: {
     initialMode: 0,                     // 0 - no stretch, 1 - basic, 2 - hybrid, 3 - conditional
@@ -110,9 +114,6 @@ var ExtensionConf = {
       retryTimeout: 200
     }
   },
-  pan: {
-    mousePanEnabled: false
-  },
   pageInfo: {
     timeouts: {
       urlCheck: 200,

js/lib/Comms.js

@@ -60,7 +60,7 @@ class CommsClient {
     if (message.cmd === "set-ar") {
       this.pageInfo.setAr(message.ratio);
     } else if (message.cmd === 'set-video-float') {
-      this.settings.active.miscFullscreenSettings.videoFloat = message.newFloat;
+      this.pageInfo.setVideoFloat(message.newFloat);
       this.pageInfo.restoreAr();
     } else if (message.cmd === "set-stretch") {
       this.pageInfo.setStretchMode(StretchMode[message.mode]);
@@ -248,7 +248,6 @@ class CommsServer {
       this.settings.save();
     } else if (message.cmd === 'set-video-float') {
       this.sendToActive(message);
-      this.settings.active.miscFullscreenSettings.videoFloat = message.newFloat;
       this.settings.save();
     } else if (message.cmd === 'autoar-start') {
       this.sendToActive(message);

js/lib/Settings.js

@@ -18,7 +18,7 @@ class Settings {
           }
         }
         if(changes['uwSettings'] && changes['uwSettings'].newValue) {
-          ths.active = JSON.parse(changes.uwSettings.newValue);
+          ths.setActive(JSON.parse(changes.uwSettings.newValue));
         }
 
         if(this.updateCallback) {
@@ -38,7 +38,7 @@ class Settings {
           }
         }
         if(changes['uwSettings'] && changes['uwSettings'].newValue) {
-          ths.active = JSON.parse(changes.uwSettings.newValue);
+          ths.setActive(JSON.parse(changes.uwSettings.newValue));
         }
 
         if(this.updateCallback) {
@@ -155,6 +155,7 @@ class Settings {
     this.set(this.default);
   }
 
+
   // -----------------------------------------
   // Nastavitve za posamezno stran
   // Config for a given page:
@@ -173,7 +174,17 @@ class Settings {
   //    * enabled     — always allow
   //    * default     — allow if default is to allow, block if default is to block
   //    * disabled    — never allow
-  
+
+  getSiteSettings(site) {
+    if (!site) {
+      site = window.location.hostname;
+    }
+    if (!site || !this.active.sites[site]) {
+      return {};
+    }
+    return this.active.sites[site];
+  }
+
   canStartExtension(site) {
     // returns 'true' if extension can be started on a given site. Returns false if we shouldn't run.
     if (!site) {
@@ -260,4 +271,31 @@ class Settings {
       return false;
     }
   }
+
+  getDefaultAr(site) {
+    site = this.getSiteSettings(site);
+
+    if (this.active.sites[site].ar) {
+      return this.active.sites[site].ar;
+    }
+    return this.active.miscFullscreenSettings.defaultAr;
+  }
+
+  getDefaultStretch(site) {
+    site = this.getSiteSettings(site);
+
+    if (this.active.sites[site].stretch) {
+      return this.active.sites[site].stretch;
+    }
+    return this.active.miscFullscreenSettings.stretch.initialMode;
+  }
+
+  getDefaultVideoAlignment(site) {
+    site = this.getSiteSettings(site);
+
+    if (this.active.sites[site].videoAlignment) {
+      return this.active.sites[site].videoAlignment;
+    }
+    return this.active.miscFullscreenSettings.videoFloat;
+  }
 }

js/modules/ArDetect.js

@@ -476,9 +476,9 @@ class ArDetector {
           var newCanvasWidth = window.innerHeight * (this.video.videoWidth / this.video.videoHeight);
           var newCanvasHeight = window.innerHeight;
           
-          if(this.settings.active.miscFullscreenSettings.videoFloat == "center")
+          if(this.resizer.videFloat === "center")
             this.canvasDrawWindowHOffset = Math.round((window.innerWidth - newCanvasWidth) * 0.5);
-          else if(this.settings.active.miscFullscreenSettings.videFloat == "left")
+          else if(this.resizer.videFloat == "left")
             this.canvasDrawWindowHOffset = 0;
           else
             this.canvasDrawWindowHOffset = window.innerWidth - newCanvasWidth;

js/modules/Resizer.js

@@ -33,15 +33,16 @@ class Resizer {
     // CSS watcher will trigger _very_ often for this many iterations
     this.cssWatcherIncreasedFrequencyCounter = 0;
 
-
-    this.lastAr = {type: 'original'};
+    
+    this.lastAr = this.settings.getDefaultAr();                 // this is the aspect ratio we start with
+    this.videoFloat = this.settings.getDefaultVideoAlignment(); // this is initial video alignment
     this.destroyed = false;
 
     this.resizerId = (Math.random(99)*100).toFixed(0);
 
     if (this.settings.active.pan) {
-      console.log("can pan:", this.settings.active.pan.mousePanEnabled, "(default:", this.settings.active.pan.mousePanEnabled, ")")
-      this.canPan = this.settings.active.pan.mousePanEnabled;
+      console.log("can pan:", this.settings.active.miscFullscreenSettings.mousePan.enabled, "(default:", this.settings.active.miscFullscreenSettings.mousePan.enabled, ")")
+      this.canPan = this.settings.active.miscFullscreenSettings.mousePan.enabled;
     } else {
       this.canPan = false;
     }
@@ -306,10 +307,10 @@ class Resizer {
       translate.x = wdiff * this.pan.relativeOffsetX / this.zoom.scale;
       translate.y = hdiff * this.pan.relativeOffsetY / this.zoom.scale;
     } else {
-      if (this.settings.active.miscFullscreenSettings.videoFloat == "left") {
+      if (this.videoFloat == "left") {
         translate.x = wdiff * 0.5;
       }
-      else if (this.settings.active.miscFullscreenSettings.videoFloat == "right") {
+      else if (this.videoFloat == "right") {
         translate.x = wdiff * -0.5;
       }
     }

js/modules/Stretcher.js

@@ -12,7 +12,7 @@ class Stretcher {
   constructor(videoData) {
     this.conf = videoData;
     this.settings = videoData.settings;
-    this.mode = this.settings.active.stretch.initialMode;
+    this.mode = this.settings.getDefaultStretchMode();
   }
 
   applyConditionalStretch(stretchFactors, actualAr){