From 3768575bad672afd55edefbe0d1b2076f809c482 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Tue, 22 Oct 2019 01:33:56 +0200
Subject: [PATCH 01/32] Allow default keyboard shortcuts to work on non-ASCII
 layouts

---
 src/common/js/KeyboardShortcutParser.js       |  2 +-
 src/ext/lib/ActionHandler.js                  | 25 +++++++++++++++++--
 .../SetShortcutButton.vue                     |  1 +
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/common/js/KeyboardShortcutParser.js b/src/common/js/KeyboardShortcutParser.js
index 03236fc..f87c86c 100644
--- a/src/common/js/KeyboardShortcutParser.js
+++ b/src/common/js/KeyboardShortcutParser.js
@@ -1,6 +1,6 @@
 class KeyboardShortcutParser {
   static parseShortcut(keypress) {
-    var shortcutCombo = '';
+    let shortcutCombo = '';
   
     if (keypress.ctrlKey) {
       shortcutCombo += 'Ctrl + ';
diff --git a/src/ext/lib/ActionHandler.js b/src/ext/lib/ActionHandler.js
index 791e72b..2048d8e 100644
--- a/src/ext/lib/ActionHandler.js
+++ b/src/ext/lib/ActionHandler.js
@@ -181,19 +181,40 @@ class ActionHandler {
     return false;
   }
 
-  isActionMatch(shortcut, event) {
+  isLatin(key) {
+    return 'abcdefghijklmnopqrstuvwxyz,.-+1234567890'.indexOf(key.toLocaleLowerCase()) !== -1;
+  }
+
+  isActionMatchStandard(shortcut, event) {
     return shortcut.key      === event.key     &&
            shortcut.ctrlKey  === event.ctrlKey &&
            shortcut.metaKey  === event.metaKey &&
            shortcut.altKey   === event.altKey  &&
            shortcut.shiftKey === event.shiftKey
   }
+  isActionMatchKeycode(shortcut, event) {
+    return shortcut.keyCode  === event.key     &&
+           shortcut.ctrlKey  === event.ctrlKey &&
+           shortcut.metaKey  === event.metaKey &&
+           shortcut.altKey   === event.altKey  &&
+           shortcut.shiftKey === event.shiftKey
+  }
+
+  isActionMatch(shortcut, event, isLatin = true) {
+    // ASCII and symbols fall back to keycode matching, because we don't know for sure that
+    // regular matching by key is going to work
+    return isLatin ? 
+      this.isActionMatchStandard(shortcut, event) : 
+      this.isActionMatchStandard(shortcut, event) || this.isActionMatchKeycode(shortcut, event);
+  }
 
   execAction(actions, event, videoData) {
     this.logger.log('info', 'keyboard', "%c[ActionHandler::execAction] Trying to find and execute action for event. Actions/event: ", "color: #ff0", actions, event);
 
+    const isLatin = this.isLatin(event.key);
+
     for (var action of actions) {
-      if (this.isActionMatch(action.shortcut, event)) {
+      if (this.isActionMatch(action.shortcut, event, isLatin)) {
         this.logger.log('info', 'keyboard', "%c[ActionHandler::execAction] found an action associated with keypress/event: ", "color: #ff0", action);
 
         for (var cmd of action.cmd) {
diff --git a/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue b/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
index 7810b4d..0a07260 100644
--- a/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
+++ b/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
@@ -38,6 +38,7 @@ export default {
       if (this.waitingForPress) {
         const shortcut = {
           key: event.key,
+          keyCode: event.keyCode,
           ctrlKey: event.ctrlKey,
           metaKey: event.metaKey,
           altKey: event.altKey,

From 4a9ef1f9dbe039737717a68a2675b4aa56b84932 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Tue, 22 Oct 2019 01:40:38 +0200
Subject: [PATCH 02/32] Fix 'clear shortcut' button (probably)

---
 .../scope-settings-component/SetShortcutButton.vue         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue b/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
index 0a07260..d32b89c 100644
--- a/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
+++ b/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
@@ -7,7 +7,7 @@
            @focus="initiateKeypress"
            @keyup="processKeyup"
     />
-    <span v-if="shortcut" @click="$emit('set-shortcut')">(Clear shortcut)</span>
+    <span v-if="shortcut" @click="clearShortcut()">(Clear shortcut)</span>
   </div>
 </template>
 
@@ -51,6 +51,11 @@ export default {
         this.shortcutText = KeyboardShortcutParser.parseShortcut(shortcut);
       }
       this.waitingForPress = false;
+    },
+    clearShortcut() {
+      this.shortcutText = '[click to add shortcut]';
+      this.shortcut = undefined;
+      this.$emit('set-shortcut');
     }
   }
 }

From cd4e3768e2bf220a42455f47a0e47aad9c595adf Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Tue, 22 Oct 2019 01:40:46 +0200
Subject: [PATCH 03/32] Make compiler a bit happier.

---
 src/common/components/ActionAlt.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/components/ActionAlt.vue b/src/common/components/ActionAlt.vue
index 64e8de1..47cf2e2 100644
--- a/src/common/components/ActionAlt.vue
+++ b/src/common/components/ActionAlt.vue
@@ -5,7 +5,7 @@
 
       </div>
       <div class="flex action-name">
-        <span v-if="action.cmd && action.cmd.length > 1 || action.cmd[0].action === 'set-ar' && action.cmd[0].arg === AspectRatio.Fixed" class="icon red" @click="removeAction()">🗙</span> &nbsp; &nbsp;
+        <span v-if="action.cmd && action.cmd.length > 1 || action.cmd[0].action === 'set-ar' && 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}}

From 261f9a6b8de9b63373d75fb6a4ac5894d18f7df4 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Wed, 23 Oct 2019 19:34:58 +0200
Subject: [PATCH 04/32] Use event.code instead of event.keyCode. Add key codes
 to default settings

---
 src/ext/conf/ExtensionConf.js                 | 77 +++++++++----------
 src/ext/lib/ActionHandler.js                  |  8 +-
 src/options/App.vue                           |  2 +
 .../ScopeSettings.vue                         |  5 +-
 .../SetShortcutButton.vue                     |  2 +-
 5 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/src/ext/conf/ExtensionConf.js b/src/ext/conf/ExtensionConf.js
index fe99216..5dc1d9c 100644
--- a/src/ext/conf/ExtensionConf.js
+++ b/src/ext/conf/ExtensionConf.js
@@ -191,6 +191,7 @@ var ExtensionConf = {
         label: 'Automatic',   // example override, takes precedence over default label
         shortcut: [{
           key: 'a',
+          code: 'KeyA',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -204,7 +205,7 @@ var ExtensionConf = {
       show: true,
       path: 'crop',
     },
-  },{
+  }, {
     name: 'Reset to default',
     label: 'Reset',
     cmd: [{
@@ -216,6 +217,7 @@ var ExtensionConf = {
         show: true,
         shortcut: [{
           key: 'r',
+          code: 'KeyR',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -229,7 +231,7 @@ var ExtensionConf = {
       show: true,
       path: 'crop'
     },
-  },{
+  }, {
     name: 'Fit to width',
     label: 'Fit width',
     cmd: [{
@@ -241,6 +243,7 @@ var ExtensionConf = {
         show: true,
         shortcut: [{
           key: 'w',
+          code: 'KeyW',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -254,7 +257,7 @@ var ExtensionConf = {
       show: true,
       path: 'crop'
     }
-  },{
+  }, {
     name: 'Fit to height',
     label: 'Fit height',
     cmd: [{
@@ -266,6 +269,7 @@ var ExtensionConf = {
         show: true,
         shortcut: [{
           key: 'e',
+          code: 'KeyE',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -279,7 +283,7 @@ var ExtensionConf = {
       show: true,
       path: 'crop'
     }
-  },{
+  }, {
     name: 'Set aspect ratio to 16:9',
     label: '16:9',
     cmd: [{
@@ -292,6 +296,7 @@ var ExtensionConf = {
         show: true,
         shortcut:  [{
           key: 's',
+          code: 'KeyS',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -305,7 +310,7 @@ var ExtensionConf = {
       show: true,
       path: 'crop'
     }
-  },{
+  }, {
     name: 'Set aspect ratio to 21:9 (2.39:1)',
     label: '21:9',
     cmd: [{
@@ -318,6 +323,7 @@ var ExtensionConf = {
         show: true,
         shortcut: [{
           key: 'd',
+          code: 'KeyD',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -331,7 +337,7 @@ var ExtensionConf = {
       show: true,
       path: 'crop'
     }
-  },{
+  }, {
     name: 'Set aspect ratio to 18:9',
     label: '18:9',
     cmd: [{
@@ -344,6 +350,7 @@ var ExtensionConf = {
         show: true,
         shortcut: [{
           key: 'x',
+          code: 'KeyX',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -357,7 +364,7 @@ var ExtensionConf = {
       show: true,
       path: 'crop',
     }
-  },{
+  }, {
     name: 'Zoom in',
     label: 'Zoom',
     cmd: [{
@@ -369,6 +376,7 @@ var ExtensionConf = {
         show: false,
         shortcut: [{
           key: 'z',
+          code: 'KeyY',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -381,7 +389,7 @@ var ExtensionConf = {
     playerUi: {
       show: false,
     }
-  },{
+  }, {
     name: 'Zoom out',
     label: 'Unzoom',
     cmd: [{
@@ -393,6 +401,7 @@ var ExtensionConf = {
         show: false,
         shortcut: [{
           key: 'u',
+          code: 'KeyU',
           ctrlKey: false,
           metaKey: false,
           altKey: false, 
@@ -405,32 +414,18 @@ var ExtensionConf = {
     playerUi: {
       show: false
     }
-  },{
+  }, {
     name: 'Toggle panning mode',
     label: 'Toggle pan',
     cmd: [{
       action: 'toggle-pan',
       arg: 'toggle'
     }],
-    scopes: {
-      page: {
-        show: true,
-        shortcut: [{
-          key: 'p',
-          ctrlKey: false,
-          metaKey: false,
-          altKey: false, 
-          shiftKey: false,
-          onKeyUp: true,
-          onKeyDown: false,
-        }]
-      }
-    },
     playerUi: {
       show: true,
       path: 'zoom'
     }
-  },{
+  }, {
     name: 'Hold to pan',
     cmd: [{
       action: 'pan',
@@ -479,7 +474,7 @@ var ExtensionConf = {
       show: true,
       path: 'stretch'
     }
-  },{
+  }, {
     name: 'Set stretch to "basic"',
     label: 'Basic stretch',
     cmd: [{
@@ -504,7 +499,7 @@ var ExtensionConf = {
       show: true,
       path: 'stretch'
     }
-  },{
+  }, {
     name: 'Set stretch to "hybrid"',
     label: 'Hybrid stretch',
     cmd: [{
@@ -529,7 +524,7 @@ var ExtensionConf = {
       show: true,
       path: 'stretch'
     }
-  },{
+  }, {
     name: 'Stretch only to hide thin borders',
     label: 'Thin borders only',
     cmd: [{
@@ -554,7 +549,7 @@ var ExtensionConf = {
       show: true,
       path: 'stretch'
     }
-  },{
+  }, {
     name: 'Set stretch to default value',
     label: 'Default',
     cmd: [{
@@ -592,7 +587,7 @@ var ExtensionConf = {
       show: true,
       path: 'align'
     }
-  },{
+  }, {
     name: 'Align video to center',
     label: 'Center',
     cmd: [{
@@ -614,7 +609,7 @@ var ExtensionConf = {
       show: true,
       path: 'align'
     }
-  },{
+  }, {
     name: 'Align video to the right',
     label: 'Right',
     cmd: [{
@@ -636,7 +631,7 @@ var ExtensionConf = {
       show: true,
       path: 'align'
     }
-  },{
+  }, {
     name: 'Use default alignment',
     label: 'Default',
     cmd: [{
@@ -669,7 +664,7 @@ var ExtensionConf = {
         show: true,
       }
     }
-  },{
+  }, {
     name: 'Enable extension on whitelisted sites only',
     label: 'On whitelist only',
     cmd: [{
@@ -682,7 +677,7 @@ var ExtensionConf = {
         show: true
       }
     }
-  },{
+  }, {
     name: 'Extension mode: use default settings',
     label: 'Default',
     cmd: [{
@@ -695,7 +690,7 @@ var ExtensionConf = {
         show: true
       }
     }
-  },{
+  }, {
     name: 'Disable extension',
     label: 'Disable',
     cmd: [{
@@ -711,7 +706,7 @@ var ExtensionConf = {
         show: true,
       }
     }
-  },{
+  }, {
     name: 'Enable automatic aspect ratio detection',
     label: 'Enable',
     cmd: [{
@@ -727,7 +722,7 @@ var ExtensionConf = {
         show: true
       }
     }
-  },{
+  }, {
     name: 'Enable automatic aspect ratio detection on whitelisted sites only',
     label: 'On whitelist only',
     cmd: [{
@@ -740,7 +735,7 @@ var ExtensionConf = {
         show: true,
       }
     }
-  },{
+  }, {
     name: 'Use default settings for automatic aspect ratio detection',
     label: 'Default',
     cmd: [{
@@ -753,7 +748,7 @@ var ExtensionConf = {
         show: true,
       }
     }
-  },{
+  }, {
     name: 'Disable automatic aspect ratio detection',
     label: 'Disable',
     cmd: [{
@@ -792,7 +787,7 @@ var ExtensionConf = {
         show: true,
       }
     }
-  },{
+  }, {
     name: 'Enable keyboard shortcuts on whitelisted sites only',
     label: 'On whitelist only',
     cmd: [{
@@ -804,7 +799,7 @@ var ExtensionConf = {
         show: true
       },
     }
-  },{
+  }, {
     name: 'Keyboard shortcuts mode: use default settings',
     label: 'Default',
     cmd: [{
@@ -816,7 +811,7 @@ var ExtensionConf = {
         show: true
       }
     }
-  },{
+  }, {
     name: 'Disable keyboard shortcuts',
     label: 'Disable',
     cmd: [{
diff --git a/src/ext/lib/ActionHandler.js b/src/ext/lib/ActionHandler.js
index 2048d8e..789875e 100644
--- a/src/ext/lib/ActionHandler.js
+++ b/src/ext/lib/ActionHandler.js
@@ -192,8 +192,8 @@ class ActionHandler {
            shortcut.altKey   === event.altKey  &&
            shortcut.shiftKey === event.shiftKey
   }
-  isActionMatchKeycode(shortcut, event) {
-    return shortcut.keyCode  === event.key     &&
+  isActionMatchKeyCode(shortcut, event) {
+    return shortcut.code     === event.code    &&
            shortcut.ctrlKey  === event.ctrlKey &&
            shortcut.metaKey  === event.metaKey &&
            shortcut.altKey   === event.altKey  &&
@@ -201,11 +201,11 @@ class ActionHandler {
   }
 
   isActionMatch(shortcut, event, isLatin = true) {
-    // ASCII and symbols fall back to keycode matching, because we don't know for sure that
+    // ASCII and symbols fall back to key code matching, because we don't know for sure that
     // regular matching by key is going to work
     return isLatin ? 
       this.isActionMatchStandard(shortcut, event) : 
-      this.isActionMatchStandard(shortcut, event) || this.isActionMatchKeycode(shortcut, event);
+      this.isActionMatchStandard(shortcut, event) || this.isActionMatchKeyCode(shortcut, event);
   }
 
   execAction(actions, event, videoData) {
diff --git a/src/options/App.vue b/src/options/App.vue
index e75b582..7408a80 100644
--- a/src/options/App.vue
+++ b/src/options/App.vue
@@ -109,6 +109,8 @@
 </template>
 
 <script>
+import ControlsSettings from './controls-settings/ControlsSettings';
+import GeneralSettings from './GeneralSettings';
 import Donate from '../common/misc/Donate.vue';
 import SuperAdvancedSettings from './SuperAdvancedSettings.vue';
 import Debug from '../ext/conf/Debug.js';
diff --git a/src/options/controls-settings/scope-settings-component/ScopeSettings.vue b/src/options/controls-settings/scope-settings-component/ScopeSettings.vue
index b3aa10d..5ed19c0 100644
--- a/src/options/controls-settings/scope-settings-component/ScopeSettings.vue
+++ b/src/options/controls-settings/scope-settings-component/ScopeSettings.vue
@@ -39,12 +39,11 @@
 </template>
 
 <script>
-import SetShortcutButton from './SetShortcutButton.vue';
-
+import SetShortcutButton from './SetShortcutButton';
 
 export default {
   components: {
-    SetShortcutButton
+    SetShortcutButton,
   },
   props: {
     scopeOptions: Object,
diff --git a/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue b/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
index d32b89c..263ab36 100644
--- a/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
+++ b/src/options/controls-settings/scope-settings-component/SetShortcutButton.vue
@@ -38,7 +38,7 @@ export default {
       if (this.waitingForPress) {
         const shortcut = {
           key: event.key,
-          keyCode: event.keyCode,
+          code: event.code,
           ctrlKey: event.ctrlKey,
           metaKey: event.metaKey,
           altKey: event.altKey,

From f652bce8fee76d3a1035949ba32a5d344f36d6a7 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Wed, 23 Oct 2019 20:01:11 +0200
Subject: [PATCH 05/32] Prepare version update stuff, readme updates

---
 CHANGELOG.md                       |  6 ++++++
 package.json                       |  2 +-
 src/manifest.json                  |  2 +-
 src/popup/panels/WhatsNewPanel.vue | 11 +++++++----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 117e1c5..ac632d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,12 @@ QoL improvements for me:
 
 * logging: allow to enable logging at will and export said logs to a file
 
+### v.4.3.2 (future)
+
+* Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, without having to rebind them manually. (Only applicable for new installs — existing users need to reset settings to default in extension settings)
+* NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.
+* Ability to preserve aspect ratio between different videos (applies to current page and doesn't survive proper page reloads)
+
 ### v4.3.1 (current)
 
 * Minor rework of settings page (actions & shortcuts section)
diff --git a/package.json b/package.json
index 29760ca..ecc1d19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ultravidify",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "description": "Aspect ratio fixer for youtube that works around some people's disability to properly encode 21:9 (and sometimes, 16:9) videos.",
   "author": "Tamius Han <tamius.han@gmail.com>",
   "scripts": {
diff --git a/src/manifest.json b/src/manifest.json
index 9142234..ad0f111 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Ultrawidify",
   "description": "Removes black bars on ultrawide videos and offers advanced options to fix aspect ratio.",
-  "version": "4.3.1.1",
+  "version": "4.3.2",
   "applications": {
     "gecko": {
       "id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}"
diff --git a/src/popup/panels/WhatsNewPanel.vue b/src/popup/panels/WhatsNewPanel.vue
index 1e8df1a..33d0ae0 100644
--- a/src/popup/panels/WhatsNewPanel.vue
+++ b/src/popup/panels/WhatsNewPanel.vue
@@ -2,11 +2,14 @@
   <div>
     <h2>What's new</h2>
     <p>Full changelog for older versions <a href="https://github.com/xternal7/ultrawidify/blob/master/CHANGELOG.md">is available here</a>.</p>
-    <p class="label">4.3.1.1</p>
+    <p class="label">4.3.2</p>
     <ul>
-      <li><b>[4.3.3.1]</b> Patched twitch.tv</li>
-      <li>Minor rework of settings page (actions & shortcuts section)</li>
-      <li>Fixed bug that prevented settings page from opening</li>
+      <li>Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, 
+          without having to rebind them manually. <b>NOTE: Only applicable for new installs — existing users need to reset 
+          settings to default in extension settings</b></li>
+      <li>NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.</li>
+      <li>Ability to preserve aspect ratio between different videos (applies to current page and doesn't survive proper 
+          page reloads)</li>
     </ul>
   </div>
 </template>

From ab06f0bd4108068a537da45d55409a8278f49d32 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Thu, 24 Oct 2019 00:44:27 +0200
Subject: [PATCH 06/32] Add saveWithoutReload() to settings.js

---
 src/ext/lib/Settings.js | 71 +++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 0caed9e..344f101 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -26,42 +26,28 @@ class Settings {
 
     const ths = this;
 
-    if(currentBrowser.firefox) {
-      browser.storage.onChanged.addListener( (changes, area) => {
-        this.logger.log('info', 'settings', "[Settings::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area);
-        if (changes['uwSettings'] && changes['uwSettings'].newValue) {
-          this.logger.log('info', 'settings',"[Settings::<storage/on change>] new settings object:", JSON.parse(changes.uwSettings.newValue));
-        }
-        if(changes['uwSettings'] && changes['uwSettings'].newValue) {
-          ths.setActive(JSON.parse(changes.uwSettings.newValue));
-        }
-
-        if(this.updateCallback) {
-          try {
-            updateCallback(ths);
-          } catch (e) {
-            this.logger.log('error', 'settings', "[Settings] CALLING UPDATE CALLBACK FAILED.")
-          }
-        }
-      });
+    if (currentBrowser.firefox) {
+      browser.storage.onChanged.addListener(this.storageChangeListener);
     } else if (currentBrowser.chrome) {
-      chrome.storage.onChanged.addListener( (changes, area) => {
-        this.logger.log('info', 'settings', "[Settings::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area);
-        if (changes['uwSettings'] && changes['uwSettings'].newValue) {
-          this.logger.log('info', 'settings',"[Settings::<storage/on change>] new settings object:", JSON.parse(changes.uwSettings.newValue));
-        }
-        if(changes['uwSettings'] && changes['uwSettings'].newValue) {
-          ths.setActive(JSON.parse(changes.uwSettings.newValue));
-        }
+      chrome.storage.onChanged.addListener(this.storageChangeListener);
+    }
+  }
 
-        if(this.updateCallback) {
-          try {
-            updateCallback(ths);
-          } catch (e) {
-            this.logger.log('error', 'settings',"[Settings] CALLING UPDATE CALLBACK FAILED.")
-          }
-        }
-      });
+  storageChangeListener(changes, area) {
+    this.logger.log('info', 'settings', "[Settings::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area);
+    if (changes['uwSettings'] && changes['uwSettings'].newValue) {
+      this.logger.log('info', 'settings',"[Settings::<storage/on change>] new settings object:", JSON.parse(changes.uwSettings.newValue));
+    }
+    if(changes['uwSettings'] && changes['uwSettings'].newValue) {
+      ths.setActive(JSON.parse(changes.uwSettings.newValue));
+    }
+
+    if(this.updateCallback) {
+      try {
+        updateCallback(ths);
+      } catch (e) {
+        this.logger.log('error', 'settings', "[Settings] CALLING UPDATE CALLBACK FAILED.")
+      }
     }
   }
 
@@ -307,6 +293,23 @@ class Settings {
     await this.set(this.active);
   }
 
+
+  async saveWithoutReload() {
+    if (currentBrowser.firefox) {
+      browser.storage.onChanged.removeListener(this.storageChangeListener);
+    } else if (currentBrowser.chrome) {
+      chrome.storage.onChanged.removeListener(this.storageChangeListener);
+    }
+
+    await this.save();
+
+    if(currentBrowser.firefox) {
+      browser.storage.onChanged.addListener(this.storageChangeListener);
+    } else if (currentBrowser.chrome) {
+      chrome.storage.onChanged.addListener(this.storageChangeListener);
+    }
+  }
+
   async rollback() {
     this.active = await this.get();
   }

From 8fde5bb3d6ab754426aceca66a0c5ff4d2f46b90 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Thu, 24 Oct 2019 00:45:11 +0200
Subject: [PATCH 07/32] Implement crop persistence in content script

---
 .vscode/settings.json                         |  2 +
 .../enums/crop-mode-persistence.enum.js       |  7 ++++
 src/ext/lib/video-data/PageInfo.js            | 42 +++++++++++++++----
 src/ext/lib/video-data/VideoData.js           | 12 ++++--
 src/ext/lib/video-transform/Resizer.js        | 28 ++++++++++---
 5 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 src/common/enums/crop-mode-persistence.enum.js

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 05ef9e2..c2dc21f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,10 +5,12 @@
     "blackbar",
     "blackframe",
     "canvas",
+    "comms",
     "equalish",
     "insta",
     "recursing",
     "reddit",
+    "rescan",
     "resizer",
     "textbox",
     "videodata",
diff --git a/src/common/enums/crop-mode-persistence.enum.js b/src/common/enums/crop-mode-persistence.enum.js
new file mode 100644
index 0000000..65bd77c
--- /dev/null
+++ b/src/common/enums/crop-mode-persistence.enum.js
@@ -0,0 +1,7 @@
+var CropModePersistence = Object.freeze({
+  Disabled: 0,
+  UntilPageReload: 1,
+  Forever: 2,
+});
+
+export default CropModePersistence;
\ No newline at end of file
diff --git a/src/ext/lib/video-data/PageInfo.js b/src/ext/lib/video-data/PageInfo.js
index de2720c..fd8fe39 100644
--- a/src/ext/lib/video-data/PageInfo.js
+++ b/src/ext/lib/video-data/PageInfo.js
@@ -2,6 +2,7 @@ import Debug from '../../conf/Debug';
 import VideoData from './VideoData';
 import RescanReason from './enums/RescanReason';
 import AspectRatio from '../../../common/enums/aspect-ratio.enum';
+import CropModePersistence from '../../../common/enums/crop-mode-persistence.enum';
 
 if(Debug.debug)
   console.log("Loading: PageInfo.js");
@@ -20,21 +21,26 @@ class PageInfo {
     this.lastUrl = window.location.href;
     this.extensionMode = extensionMode;
     this.readOnly = readOnly;
-
+    this.defaultCrop = undefined;
 
     if (comms){ 
       this.comms = comms;
     }
 
-    // request inject css immediately
     try {
+      // request inject css immediately
       const playerStyleString = this.settings.active.sites[window.location.host].css.replace('\\n', '');
       this.comms.sendMessage({
         cmd: 'inject-css',
         cssString: playerStyleString
       });
+
+      // try getting default crop immediately.
+      if (this.settings.active.sites[window.location.host].cropPersistence === CropModePersistence.Forever) {
+        this.defaultCrop = this.settings.active.sites[window.location.host].defaultCrop;
+      }
     } catch (e) {
-      // do nothing. It's ok if there's no special settings for the player element
+      // do nothing. It's ok if there's no special settings for the player element or crop persistence
     }
 
     this.rescan(RescanReason.PERIODIC);
@@ -197,11 +203,17 @@ class PageInfo {
           
           try {
             v = new VideoData(video, this.settings, this);
-            if (!v.invalid) {
-              v.initArDetection();
+
+            if (this.defaultCrop) {
+              if (!v.invalid) {
+                v.initArDetection();
+              } else {
+                this.logger.log('error', 'debug', 'Video is invalid. Aard not started.', video);
+              }
             } else {
-              this.logger.log('error', 'debug', 'Video is invalid. Aard not started.', video);
+              this.logger.log('info', 'debug', 'Default crop is specified for this site. Not starting aard.');
             }
+            
             this.videos.push(v);
           } catch (e) {
             this.logger.log('error', 'debug', "rescan error: failed to initialize videoData. Skipping this video.",e);
@@ -216,7 +228,7 @@ class PageInfo {
       // če smo ostali brez videev, potem odregistriraj stran. 
       // če nismo ostali brez videev, potem registriraj stran.
       //
-      // if we're left withotu videos on the current page, we unregister the page.
+      // if we're left without videos on the current page, we unregister the page.
       // if we have videos, we call register.
       if (this.comms) {
         if (this.videos.length != oldVideoCount) { // only if number of videos changed, tho
@@ -551,6 +563,22 @@ class PageInfo {
   setKeyboardShortcutsEnabled(state) {
     this.actionHandler.setKeybordLocal(state);
   }
+
+  setDefaultCrop(ar) {
+    // This means crop persistance is disabled. If crop persistance is enabled, then settings for current
+    // site MUST exist (crop persistence mode is disabled by default)
+    if (!this.settings.active.sites[window.location.host] ||
+         this.settings.active.sites[window.location.host].cropPersistence === CropModePersistence.Disabled) {
+      return;
+    }
+
+    this.defaultCrop = ar;
+    
+    if (this.settings.active.sites[window.location.host].cropPersistence === CropModePersistence.Forever) {
+      this.settings.active.sites[window.location.host].defaultAr = ar;
+      this.settings.saveWithoutReload();
+    }
+  }
 }
 
 export default PageInfo;
diff --git a/src/ext/lib/video-data/VideoData.js b/src/ext/lib/video-data/VideoData.js
index d98b9b5..8fbebd9 100644
--- a/src/ext/lib/video-data/VideoData.js
+++ b/src/ext/lib/video-data/VideoData.js
@@ -44,6 +44,7 @@ class VideoData {
     };
 
     this.resizer = new Resizer(this);
+
     this.arDetector = new ArDetector(this);  // this starts Ar detection. needs optional parameter that prevets ardetdctor from starting
     // player dimensions need to be in:
     // this.player.dimensions
@@ -59,6 +60,11 @@ class VideoData {
 
     // start fallback video/player size detection
     this.fallbackChangeDetection();
+
+    // force reload last aspect ratio (if default crop ratio exists)
+    if (this.pageInfo.defaultCrop) {
+      this.resizer.setAr(this.pageInfo.defaultCrop);
+    }
   }
 
   async fallbackChangeDetection() {
@@ -162,7 +168,7 @@ class VideoData {
       // throw {error: 'VIDEO_DATA_DESTROYED', data: {videoData: this}};
       return;
     }
-    if(this.arDetector){
+    if (this.arDetector){
       this.arDetector.init();
     }
     else{
@@ -177,8 +183,8 @@ class VideoData {
       // throw {error: 'VIDEO_DATA_DESTROYED', data: {videoData: this}};
       return;
     }
-    if(!this.arDetector) {
-      this.arDetector.init();
+    if (!this.arDetector) {
+      this.initArDetection();
     }
     this.arDetector.start();
   }
diff --git a/src/ext/lib/video-transform/Resizer.js b/src/ext/lib/video-transform/Resizer.js
index 4794d55..14d164c 100644
--- a/src/ext/lib/video-transform/Resizer.js
+++ b/src/ext/lib/video-transform/Resizer.js
@@ -7,6 +7,7 @@ import ExtensionMode from '../../../common/enums/extension-mode.enum';
 import Stretch from '../../../common/enums/stretch.enum';
 import VideoAlignment from '../../../common/enums/video-alignment.enum';
 import AspectRatio from '../../../common/enums/aspect-ratio.enum';
+import CropModePersistance from '../../../common/enums/crop-mode-persistence.enum';
 
 if(Debug.debug) {
   console.log("Loading: Resizer.js");
@@ -119,7 +120,7 @@ class Resizer {
   }
 
 
-  setAr(ar, lastAr){
+  setAr(ar, lastAr) {
     if (this.destroyed) {
       return;
     }
@@ -130,26 +131,39 @@ class Resizer {
       return;
     }
 
+    const siteSettings = this.settings.active.sites[window.location.host];
+
+    // most everything that could go wrong went wrong by this stage, and returns can happen afterwards
+    // this means here's the optimal place to set or forget aspect ratio
+    if (siteSettings && siteSettings.cropModePersistance > CropModePersistance.Disabled) {
+      if (ar.type === AspectRatio.Automatic || 
+          ar.type === AspectRatio.Reset ||
+          ar.type === AspectRatio.Initial ) {
+        // reset/undo default 
+        this.conf.pageInfo.setDefaultCrop(undefined);
+      } else {
+        this.conf.pageInfo.setDefaultCrop(ar);
+      }
+    }
+
     if (ar.type === AspectRatio.Automatic || 
         ar.type === AspectRatio.Reset && this.lastAr.type === AspectRatio.Initial) {
       // some sites do things that interfere with our site (and aspect ratio setting in general)
       // first, we check whether video contains anything we don't like
-
-      const siteSettings = this.settings.active.sites[window.location.host];
       if (siteSettings && siteSettings.autoarPreventConditions) {
         if (siteSettings.autoarPreventConditions.videoStyleString) {
           const styleString = (this.video.getAttribute('style') || '').split(';');
-
+  
           if (siteSettings.autoarPreventConditions.videoStyleString.containsProperty) {
             const bannedProperties = siteSettings.autoarPreventConditions.videoStyleString.containsProperty;
             for (const prop in bannedProperties) {
               for (const s of styleString) {
                 if (s.trim().startsWith(prop)) {
-
+  
                   // check if css property has a list of allowed values:
                   if (bannedProperties[prop].allowedValues) {
                     const styleValue = s.split(':')[1].trim();
-
+  
                     // check if property value is on the list of allowed values
                     // if it's not, we aren't allowed to start aard
                     if (bannedProperties[prop].allowedValues.indexOf(styleValue) === -1) {
@@ -170,6 +184,8 @@ class Resizer {
       }
     }
 
+    
+
     if (lastAr) {
       this.lastAr = this.calculateRatioForLegacyOptions(lastAr);
       ar = this.calculateRatioForLegacyOptions(ar);

From d5a6e8d707746cf62d2ca0cc63410d4608e12664 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Thu, 24 Oct 2019 21:13:45 +0200
Subject: [PATCH 08/32] change reload prevention to something a bit less
 contrived

---
 src/ext/lib/Settings.js | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 344f101..3918517 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -38,11 +38,12 @@ class Settings {
     if (changes['uwSettings'] && changes['uwSettings'].newValue) {
       this.logger.log('info', 'settings',"[Settings::<storage/on change>] new settings object:", JSON.parse(changes.uwSettings.newValue));
     }
+    const parsedSettings = JSON.parse(changes.uwSettings.newValue);
     if(changes['uwSettings'] && changes['uwSettings'].newValue) {
-      ths.setActive(JSON.parse(changes.uwSettings.newValue));
+      ths.setActive(parsedSettings);
     }
 
-    if(this.updateCallback) {
+    if(!parsedSettings.preventReload && this.updateCallback) {
       try {
         updateCallback(ths);
       } catch (e) {
@@ -289,25 +290,14 @@ class Settings {
     if (Debug.debug && Debug.storage) {
       console.log("[Settings::save] Saving active settings:", this.active);
     }
-
+    this.active.preventReload = undefined;
     await this.set(this.active);
   }
 
 
   async saveWithoutReload() {
-    if (currentBrowser.firefox) {
-      browser.storage.onChanged.removeListener(this.storageChangeListener);
-    } else if (currentBrowser.chrome) {
-      chrome.storage.onChanged.removeListener(this.storageChangeListener);
-    }
-
-    await this.save();
-
-    if(currentBrowser.firefox) {
-      browser.storage.onChanged.addListener(this.storageChangeListener);
-    } else if (currentBrowser.chrome) {
-      chrome.storage.onChanged.addListener(this.storageChangeListener);
-    }
+    this.active.preventReload = true;
+    await this.set(this.active);
   }
 
   async rollback() {

From d0058cedb909d9261cec1d00e59c32df221d4a46 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Thu, 24 Oct 2019 23:27:43 +0200
Subject: [PATCH 09/32] Changes to how crop mode persistence works, extra
 persistence options

---
 .../enums/crop-mode-persistence.enum.js       |  4 +-
 src/ext/conf/ActionList.js                    | 28 ++++++
 src/ext/conf/ExtensionConf.js                 | 88 +++++++++++++++++++
 src/ext/lib/Settings.js                       | 10 +++
 src/ext/lib/video-data/PageInfo.js            | 36 ++++++--
 src/ext/lib/video-transform/Resizer.js        |  2 +-
 6 files changed, 160 insertions(+), 8 deletions(-)

diff --git a/src/common/enums/crop-mode-persistence.enum.js b/src/common/enums/crop-mode-persistence.enum.js
index 65bd77c..121eb44 100644
--- a/src/common/enums/crop-mode-persistence.enum.js
+++ b/src/common/enums/crop-mode-persistence.enum.js
@@ -1,7 +1,9 @@
 var CropModePersistence = Object.freeze({
+  Default: -1,
   Disabled: 0,
   UntilPageReload: 1,
-  Forever: 2,
+  CurrentSession: 2,
+  Forever: 3,
 });
 
 export default CropModePersistence;
\ No newline at end of file
diff --git a/src/ext/conf/ActionList.js b/src/ext/conf/ActionList.js
index 6457888..c41f906 100644
--- a/src/ext/conf/ActionList.js
+++ b/src/ext/conf/ActionList.js
@@ -2,6 +2,7 @@ import VideoAlignment from '../../common/enums/video-alignment.enum';
 import Stretch from '../../common/enums/stretch.enum';
 import ExtensionMode from '../../common/enums/extension-mode.enum';
 import AspectRatio from '../../common/enums/aspect-ratio.enum';
+import CropModePersistence from '../../common/enums/crop-mode-persistence.enum';
 
 var ActionList = {
   'set-ar': {
@@ -30,6 +31,33 @@ var ActionList = {
       page: true,
     }
   },
+  'set-ar-persistence': {
+    name: 'Set crop mode persistence',
+    args: [{
+      name: 'Never persist',
+      arg: CropModePersistence.Disabled,
+    },{
+      name: 'While on page',
+      arg: CropModePersistence.UntilPageReload,
+    },{
+      name: 'Current session',
+      arg: CropModePersistence.CurrentSession,
+    },{
+      name: 'Always persist',
+      arg: CropModePersistence.Forever,
+    }, {
+      name: 'Default',
+      arg: CropModePersistence.Default,
+      scopes: {
+        site: true,
+      }
+    }],
+    scopes: {
+      global: true,
+      site: true,
+      page: false,
+    }
+  },
   'set-stretch': {
     name: 'Set stretch',
     args: [{
diff --git a/src/ext/conf/ExtensionConf.js b/src/ext/conf/ExtensionConf.js
index 5dc1d9c..73d227a 100644
--- a/src/ext/conf/ExtensionConf.js
+++ b/src/ext/conf/ExtensionConf.js
@@ -5,6 +5,7 @@ import Stretch from '../../common/enums/stretch.enum';
 import ExtensionMode from '../../common/enums/extension-mode.enum';
 import AntiGradientMode from '../../common/enums/anti-gradient-mode.enum';
 import AspectRatio from '../../common/enums/aspect-ratio.enum';
+import CropModePersistence from '../../common/enums/crop-mode-persistence.enum';
 
 if(Debug.debug)
   console.log("Loading: ExtensionConf.js");
@@ -364,6 +365,93 @@ var ExtensionConf = {
       show: true,
       path: 'crop',
     }
+  }, {
+    name: 'Don\'t persist crop',
+    label: 'Never persist',
+    cmd: [{
+      action: 'set-ar-persistence',
+      arg: CropModePersistence.Never,
+    }],
+    scopes: {
+      site: {
+        show: true,
+      },
+      global: {
+        show: true,
+      }
+    },
+    playerUi: {
+      show: true,
+    }
+  }, {
+    name: 'Persist crop while on page',
+    label: 'While on page',
+    cmd: [{
+      action: 'set-ar-persistence',
+      arg: CropModePersistence.UntilPageReload,
+    }],
+    scopes: {
+      site: {
+        show: true,
+      },
+      global: {
+        show: true,
+      }
+    },
+    playerUi: {
+      show: true,
+    }
+  }, {
+    name: 'Persist crop for current session',
+    label: 'Always persist',
+    cmd: [{
+      action: 'set-ar-persistence',
+      arg: CropModePersistence.CurrentSession,
+    }],
+    scopes: {
+      site: {
+        show: true,
+      },
+      global: {
+        show: true,
+      }
+    },
+    playerUi: {
+      show: true,
+    }
+  }, {
+    name: 'Persist until manually reset',
+    label: 'Always persist',
+    cmd: [{
+      action: 'set-ar-persistence',
+      arg: CropModePersistence.Forever,
+    }],
+    scopes: {
+      site: {
+        show: true,
+      },
+      global: {
+        show: true,
+      }
+    },
+    playerUi: {
+      show: true,
+    }
+  }, {
+    name: 'Default persistence',
+    label: 'Default',
+    cmd: [{
+      action: 'set-ar-persistence',
+      arg: CropModePersistence.Default,
+    }],
+    scopes: {
+      site: {
+        show: true,
+      },
+    },
+    playerUi: {
+      show: true,
+    }
   }, {
     name: 'Zoom in',
     label: 'Zoom',
diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 3918517..1e76a29 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -6,6 +6,7 @@ import ObjectCopy from '../lib/ObjectCopy';
 import Stretch from '../../common/enums/stretch.enum';
 import VideoAlignment from '../../common/enums/video-alignment.enum';
 import ExtensionConfPatch from '../conf/ExtConfPatches';
+import CropModePersistence from '../../common/enums/crop-mode-persistence.enum';
 
 
 
@@ -515,6 +516,15 @@ class Settings {
     return this.active.sites['@global'].stretch;
   }
 
+  getDefaultCropPersistenceMode(site) {
+    if (site && this.active.sites[site] && this.active.sites[site].cropModePersistence !== Stretch.Default) {
+      return this.active.sites[site].cropModePersistence;
+    }
+
+    // persistence mode thing is missing from settings by default
+    return this.active.sites['@global'].cropModePersistence || CropModePersistence.Disabled;
+  }
+
   getDefaultVideoAlignment(site) {
     if (site && this.active.sites[site] && this.active.sites[site].videoAlignment !== VideoAlignment.Default) {
       return this.active.sites[site].videoAlignment;
diff --git a/src/ext/lib/video-data/PageInfo.js b/src/ext/lib/video-data/PageInfo.js
index fd8fe39..35d2db9 100644
--- a/src/ext/lib/video-data/PageInfo.js
+++ b/src/ext/lib/video-data/PageInfo.js
@@ -22,6 +22,7 @@ class PageInfo {
     this.extensionMode = extensionMode;
     this.readOnly = readOnly;
     this.defaultCrop = undefined;
+    this.currentCrop = undefined;
 
     if (comms){ 
       this.comms = comms;
@@ -34,14 +35,23 @@ class PageInfo {
         cmd: 'inject-css',
         cssString: playerStyleString
       });
+    } catch (e) {
+      // do nothing. It's ok if there's no special settings for the player element or crop persistence
+    }
 
-      // try getting default crop immediately.
-      if (this.settings.active.sites[window.location.host].cropPersistence === CropModePersistence.Forever) {
+    // try getting default crop immediately.
+    const cropModePersistence = this.settings.active.getDefaultCropPersistenceMode(window.location.host);
+
+    try {
+      if (cropModePersistence === CropModePersistence.Forever) {
         this.defaultCrop = this.settings.active.sites[window.location.host].defaultCrop;
+      } else if (cropModePersistence === CropModePersistence.CurrentSession) {
+        this.defaultCrop = JSON.parse(sessionStorage.getItem('uw-crop-mode-session-persistence'));
       }
     } catch (e) {
       // do nothing. It's ok if there's no special settings for the player element or crop persistence
     }
+    this.currentCrop = this.defaultCrop;
 
     this.rescan(RescanReason.PERIODIC);
     this.scheduleUrlCheck();
@@ -565,17 +575,31 @@ class PageInfo {
   }
 
   setDefaultCrop(ar) {
+    this.currentCrop = ar;
     // This means crop persistance is disabled. If crop persistance is enabled, then settings for current
     // site MUST exist (crop persistence mode is disabled by default)
-    if (!this.settings.active.sites[window.location.host] ||
-         this.settings.active.sites[window.location.host].cropPersistence === CropModePersistence.Disabled) {
+
+    const cropModePersistence = this.settings.active.getDefaultCropPersistenceMode(window.location.host);
+
+    if (cropModePersistence === CropModePersistence.Disabled) {
       return;
     }
 
     this.defaultCrop = ar;
     
-    if (this.settings.active.sites[window.location.host].cropPersistence === CropModePersistence.Forever) {
-      this.settings.active.sites[window.location.host].defaultAr = ar;
+    if (cropModePersistence === CropModePersistence.CurrentSession) {
+      sessionStorage.setItem('uw-crop-mode-session-persistence', JSON.stringify(ar));
+    } else if (cropModePersistence === CropModePersistence.Forever) {
+      if (this.settings.active.sites[window.location.host]) {
+        //                                              | key may be missing, so we do this
+        this.settings.active.sites[window.location.host]['defaultAr'] = ar;
+      } else {
+        // add options for new site if they're missing!
+        this.settings.active.sites[window.location.host] = {
+          defaultAr: ar,
+        }
+      }
+      
       this.settings.saveWithoutReload();
     }
   }
diff --git a/src/ext/lib/video-transform/Resizer.js b/src/ext/lib/video-transform/Resizer.js
index 14d164c..d9c35b6 100644
--- a/src/ext/lib/video-transform/Resizer.js
+++ b/src/ext/lib/video-transform/Resizer.js
@@ -135,7 +135,7 @@ class Resizer {
 
     // most everything that could go wrong went wrong by this stage, and returns can happen afterwards
     // this means here's the optimal place to set or forget aspect ratio
-    if (siteSettings && siteSettings.cropModePersistance > CropModePersistance.Disabled) {
+    if (this.settings.getDefaultCropPersistenceMode(window.location.host) > CropModePersistance.Disabled) {
       if (ar.type === AspectRatio.Automatic || 
           ar.type === AspectRatio.Reset ||
           ar.type === AspectRatio.Initial ) {

From cda5d87735eb057593e526dd349dfa5dcee09154 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Fri, 25 Oct 2019 00:59:02 +0200
Subject: [PATCH 10/32] Display new options in popup, update ExecAction

---
 src/common/mixins/ComputeActionsMixin.js  |  3 +++
 src/ext/lib/video-data/PageInfo.js        | 22 ++++++++++++++----
 src/popup/js/ExecAction.js                | 28 ++++++++++++++++++++++-
 src/popup/panels/DefaultSettingsPanel.vue | 22 ++++++++++++++++--
 src/popup/panels/VideoPanel.vue           | 14 ++++++++++--
 5 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/src/common/mixins/ComputeActionsMixin.js b/src/common/mixins/ComputeActionsMixin.js
index 11689ee..6fd6e5d 100644
--- a/src/common/mixins/ComputeActionsMixin.js
+++ b/src/common/mixins/ComputeActionsMixin.js
@@ -12,6 +12,9 @@ export default {
     aspectRatioActions: function(){
       return this.scopeActions.filter(x => x.cmd.length === 1 && x.cmd[0].action === 'set-ar') || [];
     },
+    cropModePersistenceActions: function() {
+      return this.scopeActions.filter(x => x.cmd.length === 1 && x.cmd[0].action === 'set-ar-persistence') || [];
+    },
     stretchActions: function(){
       return this.scopeActions.filter(x => x.cmd.length === 1 && x.cmd[0].action === 'set-stretch') || [];
     },
diff --git a/src/ext/lib/video-data/PageInfo.js b/src/ext/lib/video-data/PageInfo.js
index 35d2db9..b23ecbe 100644
--- a/src/ext/lib/video-data/PageInfo.js
+++ b/src/ext/lib/video-data/PageInfo.js
@@ -574,6 +574,22 @@ class PageInfo {
     this.actionHandler.setKeybordLocal(state);
   }
 
+  setArPersistence(persistenceMode) {
+    if (persistenceMode === CropModePersistence.CurrentSession) {
+      sessionStorage.setItem('uw-crop-mode-session-persistence', JSON.stringify(this.currentCrop));
+    } else if (persistenceMode === CropModePersistence.Forever) {
+      if (this.settings.active.sites[window.location.host]) {
+        //                                              | key may be missing, so we do this
+        this.settings.active.sites[window.location.host]['defaultAr'] = this.currentCrop;
+      } else {
+        this.settings.active.sites[window.location.host] = this.settings.getDefaultOption();
+        this.settings.active.sites[window.location.host]['defaultAr'] = this.currentCrop;
+      }
+      
+      this.settings.saveWithoutReload();
+    }
+  }
+
   setDefaultCrop(ar) {
     this.currentCrop = ar;
     // This means crop persistance is disabled. If crop persistance is enabled, then settings for current
@@ -594,10 +610,8 @@ class PageInfo {
         //                                              | key may be missing, so we do this
         this.settings.active.sites[window.location.host]['defaultAr'] = ar;
       } else {
-        // add options for new site if they're missing!
-        this.settings.active.sites[window.location.host] = {
-          defaultAr: ar,
-        }
+        this.settings.active.sites[window.location.host] = this.settings.getDefaultOption();
+        this.settings.active.sites[window.location.host]['defaultAr'] = ar;
       }
       
       this.settings.saveWithoutReload();
diff --git a/src/popup/js/ExecAction.js b/src/popup/js/ExecAction.js
index 422cb7c..130a3fe 100644
--- a/src/popup/js/ExecAction.js
+++ b/src/popup/js/ExecAction.js
@@ -13,7 +13,7 @@ class ExecAction {
     this.site = site;
   }
 
-  exec(action, scope, frame) {
+  async exec(action, scope, frame) {
     for (var cmd of action.cmd) {
       if (scope === 'page') {
         const message = {
@@ -27,6 +27,32 @@ class ExecAction {
         Comms.sendMessage(message);
       } else {
 
+        // set-ar-persistence sends stuff to content scripts as well (!)
+        // it's important to do that BEFORE the save step
+        if (cmd === 'set-ar-persistence') {
+          let message;
+          if (scope === 'site') {
+            message = {
+              forwardToContentScript: true,
+              targetFrame: frame,
+              frame: frame,
+              cmd: cmd.action,
+              arg: cmd.arg,
+            }
+          } else {
+            message = {
+              forwardToAll: true,
+              targetFrame: frame,
+              frame: frame,
+              cmd: cmd.action,
+              arg: cmd.arg,
+            }
+          }
+          // this hopefully delays settings.save() until current crops are saved on the site
+          // and thus avoid any fucky-wuckies
+          await Comms.sendMessage(message);
+        }
+
         let site = this.site;
         if (scope === 'global') {
           site = '@global';
diff --git a/src/popup/panels/DefaultSettingsPanel.vue b/src/popup/panels/DefaultSettingsPanel.vue
index a4e57d9..4754e8f 100644
--- a/src/popup/panels/DefaultSettingsPanel.vue
+++ b/src/popup/panels/DefaultSettingsPanel.vue
@@ -31,7 +31,7 @@
       <div class="flex flex-row flex-wrap">
         <ShortcutButton v-for="(action, index) of aardActions"
                         class="flex flex-grow button"
-                        :class="{'setting-selected': getCurrent('autoar') === action.cmd[0].arg}"
+                        :class="{'setting-selected': getCurrent('cropModePersistence') === action.cmd[0].arg}"
                         :key="index"
                         :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
                         :shortcut="parseShortcut(action)"
@@ -42,9 +42,27 @@
       </div>
     </div>
 
+    <!-- CROP MODE PERSISTENCE -->
+    <div v-if="cropModePersistenceActions.length"
+         class="w100"
+    >
+      <div class="label">Persists crop mode <template v-if="scope === 'site'">for {{site}}</template>:</div>
+      <div class="flex flex-row flex-wrap">
+        <ShortcutButton v-for="(action, index) of cropModePersistenceActions"
+                        class="flex flex-grow button"
+                        :class="{'setting-selected': getCurrent('autoar') === action.cmd[0].arg}"
+                        :key="index"
+                        :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
+                        :shortcut="parseShortcut(action)"
+                        @click.native="execAction(action)"
+        >
+        </ShortcutButton>
+      </div>
+    </div>
+
     <!-- DEFAULT SETTINGS -->
     <div v-if="stretchActions.length">
-      <div class="label">Default stretching mode:</div>
+      <div class="label experimental">Default stretching mode:</div>
       <div class="flex flex-row flex-wrap">
         <ShortcutButton v-for="(action, index) of stretchActions"
                         class="flex b3 flex-grow button"
diff --git a/src/popup/panels/VideoPanel.vue b/src/popup/panels/VideoPanel.vue
index 18ea984..3e66185 100644
--- a/src/popup/panels/VideoPanel.vue
+++ b/src/popup/panels/VideoPanel.vue
@@ -5,6 +5,13 @@
     </div>
     <div v-if="aspectRatioActions.length">
       <div class="label">Cropping mode:</div>
+      <div v-if="cropModePersistence && cropModePersistence > CropModePersistence.Disabled" class="info">
+        Cropping mode will persist
+         <template v-if="cropModePersistence === CropModePersistence.UntilPageReload">until page reload (this includes page navigation!).</template>
+         <template v-if="cropModePersistence === CropModePersistence.CurrentSession">for current session.</template>
+         <template v-if="cropModePersistence === CropModePersistence.Forever">forever (or at least until you change aspect ratio manually).</template>
+        This can be changed in the 'site settings' or 'extension settings' tab.
+      </div>
       <div class="flex flex-row flex-wrap">
         <ShortcutButton v-for="(action, index) of aspectRatioActions"
                         class="flex b3 flex-grow button"
@@ -12,7 +19,7 @@
                         :label="(action.scopes.page && action.scopes.page.label) ? action.scopes.page.label : action.label"
                         :shortcut="parseShortcut(action)"
                         @click.native="execAction(action)"
-                        >
+        >
         </ShortcutButton>
       </div>
     </div>
@@ -117,11 +124,13 @@ import ExecAction from '../js/ExecAction';
 import KeyboardShortcutParser from '../../common/js/KeyboardShortcutParser';
 import ShortcutButton from '../../common/components/ShortcutButton';
 import ComputeActionsMixin from '../../common/mixins/ComputeActionsMixin';
+import CropModePersistence from '../../common/enums/crop-mode-persistence.enum';
 
 export default {
   data() {
     return {
       scope: 'page',
+      CropModePersistence: CropModePersistence,
     }
   },
   mixins: [
@@ -131,7 +140,8 @@ export default {
     'settings',
     'frame',
     'zoom',
-    'someSitesDisabledWarning'
+    'someSitesDisabledWarning',
+    'cropModePersistence',
   ],
   created() {
     this.exec = new ExecAction(this.settings);

From 854bc05d14b257b7e8b39aa4eb232e10b652e2a3 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sat, 26 Oct 2019 02:38:47 +0200
Subject: [PATCH 11/32] Pass `set-ar-persistence` between CommsClient and
 pageInfo

---
 src/ext/lib/comms/CommsClient.js       |  2 ++
 src/ext/lib/video-data/PageInfo.js     |  5 ++++-
 src/ext/lib/video-transform/Resizer.js | 20 ++++++++++----------
 src/popup/js/ExecAction.js             | 25 ++++++++-----------------
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/ext/lib/comms/CommsClient.js b/src/ext/lib/comms/CommsClient.js
index 4b3d2e4..cd8c7d9 100644
--- a/src/ext/lib/comms/CommsClient.js
+++ b/src/ext/lib/comms/CommsClient.js
@@ -92,6 +92,8 @@ class CommsClient {
       this.pageInfo.setManualTick(message.arg);
     } else if (message.cmd === 'autoar-tick') {
       this.pageInfo.tick();
+    } else if (message.cmd === 'set-ar-persistence') {
+      this.pageInfo.setArPersistence(message.arg);
     }
   }
 
diff --git a/src/ext/lib/video-data/PageInfo.js b/src/ext/lib/video-data/PageInfo.js
index b23ecbe..72c3955 100644
--- a/src/ext/lib/video-data/PageInfo.js
+++ b/src/ext/lib/video-data/PageInfo.js
@@ -575,6 +575,9 @@ class PageInfo {
   }
 
   setArPersistence(persistenceMode) {
+    // name of this function is mildly misleading — we don't really _set_ ar persistence. (Ar persistence
+    // mode is set and saved via popup or keyboard shortcuts, if user defined them) We just save the current
+    // aspect ratio whenever aspect ratio persistence mode changes. 
     if (persistenceMode === CropModePersistence.CurrentSession) {
       sessionStorage.setItem('uw-crop-mode-session-persistence', JSON.stringify(this.currentCrop));
     } else if (persistenceMode === CropModePersistence.Forever) {
@@ -590,7 +593,7 @@ class PageInfo {
     }
   }
 
-  setDefaultCrop(ar) {
+  updateCurrentCrop(ar) {
     this.currentCrop = ar;
     // This means crop persistance is disabled. If crop persistance is enabled, then settings for current
     // site MUST exist (crop persistence mode is disabled by default)
diff --git a/src/ext/lib/video-transform/Resizer.js b/src/ext/lib/video-transform/Resizer.js
index d9c35b6..f0dea5a 100644
--- a/src/ext/lib/video-transform/Resizer.js
+++ b/src/ext/lib/video-transform/Resizer.js
@@ -134,16 +134,16 @@ class Resizer {
     const siteSettings = this.settings.active.sites[window.location.host];
 
     // most everything that could go wrong went wrong by this stage, and returns can happen afterwards
-    // this means here's the optimal place to set or forget aspect ratio
-    if (this.settings.getDefaultCropPersistenceMode(window.location.host) > CropModePersistance.Disabled) {
-      if (ar.type === AspectRatio.Automatic || 
-          ar.type === AspectRatio.Reset ||
-          ar.type === AspectRatio.Initial ) {
-        // reset/undo default 
-        this.conf.pageInfo.setDefaultCrop(undefined);
-      } else {
-        this.conf.pageInfo.setDefaultCrop(ar);
-      }
+    // this means here's the optimal place to set or forget aspect ratio. Saving of current crop ratio
+    // is handled in pageInfo.updateCurrentCrop(), which also makes sure to persist aspect ratio if ar
+    // is set to persist between videos / through current session / until manual reset.
+    if (ar.type === AspectRatio.Automatic || 
+        ar.type === AspectRatio.Reset ||
+        ar.type === AspectRatio.Initial ) {
+      // reset/undo default 
+      this.conf.pageInfo.updateCurrentCrop(undefined);
+    } else {
+      this.conf.pageInfo.updateCurrentCrop(ar);
     }
 
     if (ar.type === AspectRatio.Automatic || 
diff --git a/src/popup/js/ExecAction.js b/src/popup/js/ExecAction.js
index 130a3fe..03cb516 100644
--- a/src/popup/js/ExecAction.js
+++ b/src/popup/js/ExecAction.js
@@ -30,23 +30,14 @@ class ExecAction {
         // set-ar-persistence sends stuff to content scripts as well (!)
         // it's important to do that BEFORE the save step
         if (cmd === 'set-ar-persistence') {
-          let message;
-          if (scope === 'site') {
-            message = {
-              forwardToContentScript: true,
-              targetFrame: frame,
-              frame: frame,
-              cmd: cmd.action,
-              arg: cmd.arg,
-            }
-          } else {
-            message = {
-              forwardToAll: true,
-              targetFrame: frame,
-              frame: frame,
-              cmd: cmd.action,
-              arg: cmd.arg,
-            }
+          // even when setting global defaults, we only send message to the current tab in
+          // order to avoid problems related to 
+          const message = {
+            forwardToContentScript: true,
+            targetFrame: frame,
+            frame: frame,
+            cmd: cmd.action,
+            arg: cmd.arg,
           }
           // this hopefully delays settings.save() until current crops are saved on the site
           // and thus avoid any fucky-wuckies

From f05a0813d29de120eb3527194dbc9b8c23ec8e5c Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 27 Oct 2019 00:10:49 +0200
Subject: [PATCH 12/32] Fix minor issues

---
 src/ext/lib/Settings.js            | 24 ++++++++++++------------
 src/ext/lib/video-data/PageInfo.js | 22 +++++++++++-----------
 src/options/App.vue                |  2 --
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 1e76a29..508fca3 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -28,9 +28,9 @@ class Settings {
     const ths = this;
 
     if (currentBrowser.firefox) {
-      browser.storage.onChanged.addListener(this.storageChangeListener);
+      browser.storage.onChanged.addListener((changes, area) => {this.storageChangeListener(changes, area)});
     } else if (currentBrowser.chrome) {
-      chrome.storage.onChanged.addListener(this.storageChangeListener);
+      chrome.storage.onChanged.addListener((changes, area) => {this.storageChangeListener(changes, area)});
     }
   }
 
@@ -159,22 +159,22 @@ class Settings {
     //                 |   needed. In this case, we assume we're on the current version
     const oldVersion = (settings && settings.version) || this.version;
 
-    if(Debug.debug) {
+    if (settings) {
       this.logger.log('info', 'settings', "[Settings::init] Configuration fetched from storage:", settings,
                                           "\nlast saved with:", settings.version,
                                           "\ncurrent version:", this.version
       );
-
-      // if (Debug.flushStoredSettings) {
-      //   this.logger.log('info', 'settings', "%c[Settings::init] Debug.flushStoredSettings is true. Using default settings", "background: #d00; color: #ffd");
-      //   Debug.flushStoredSettings = false; // don't do it again this session
-      //   this.active = this.getDefaultSettings();
-      //   this.active.version = this.version;
-      //   this.set(this.active);
-      //   return this.active;
-      // }
     }
 
+    // if (Debug.flushStoredSettings) {
+    //   this.logger.log('info', 'settings', "%c[Settings::init] Debug.flushStoredSettings is true. Using default settings", "background: #d00; color: #ffd");
+    //   Debug.flushStoredSettings = false; // don't do it again this session
+    //   this.active = this.getDefaultSettings();
+    //   this.active.version = this.version;
+    //   this.set(this.active);
+    //   return this.active;
+    // }
+
     // if there's no settings saved, return default settings.
     if(! settings || (Object.keys(settings).length === 0 && settings.constructor === Object)) {
       this.logger.log(
diff --git a/src/ext/lib/video-data/PageInfo.js b/src/ext/lib/video-data/PageInfo.js
index 72c3955..f4a8a0c 100644
--- a/src/ext/lib/video-data/PageInfo.js
+++ b/src/ext/lib/video-data/PageInfo.js
@@ -40,17 +40,17 @@ class PageInfo {
     }
 
     // try getting default crop immediately.
-    const cropModePersistence = this.settings.active.getDefaultCropPersistenceMode(window.location.host);
+    const cropModePersistence = this.settings.getDefaultCropPersistenceMode(window.location.host);
 
-    try {
-      if (cropModePersistence === CropModePersistence.Forever) {
-        this.defaultCrop = this.settings.active.sites[window.location.host].defaultCrop;
-      } else if (cropModePersistence === CropModePersistence.CurrentSession) {
-        this.defaultCrop = JSON.parse(sessionStorage.getItem('uw-crop-mode-session-persistence'));
-      }
-    } catch (e) {
-      // do nothing. It's ok if there's no special settings for the player element or crop persistence
-    }
+    // try {
+    //   if (cropModePersistence === CropModePersistence.Forever) {
+    //     this.defaultCrop = this.settings.active.sites[window.location.host].defaultCrop;
+    //   } else if (cropModePersistence === CropModePersistence.CurrentSession) {
+    //     this.defaultCrop = JSON.parse(sessionStorage.getItem('uw-crop-mode-session-persistence'));
+    //   }
+    // } catch (e) {
+    //   // do nothing. It's ok if there's no special settings for the player element or crop persistence
+    // }
     this.currentCrop = this.defaultCrop;
 
     this.rescan(RescanReason.PERIODIC);
@@ -598,7 +598,7 @@ class PageInfo {
     // This means crop persistance is disabled. If crop persistance is enabled, then settings for current
     // site MUST exist (crop persistence mode is disabled by default)
 
-    const cropModePersistence = this.settings.active.getDefaultCropPersistenceMode(window.location.host);
+    const cropModePersistence = this.settings.getDefaultCropPersistenceMode(window.location.host);
 
     if (cropModePersistence === CropModePersistence.Disabled) {
       return;
diff --git a/src/options/App.vue b/src/options/App.vue
index 7408a80..e75b582 100644
--- a/src/options/App.vue
+++ b/src/options/App.vue
@@ -109,8 +109,6 @@
 </template>
 
 <script>
-import ControlsSettings from './controls-settings/ControlsSettings';
-import GeneralSettings from './GeneralSettings';
 import Donate from '../common/misc/Donate.vue';
 import SuperAdvancedSettings from './SuperAdvancedSettings.vue';
 import Debug from '../ext/conf/Debug.js';

From 828ded6b29ee3622302aac279d0886eed92ccdd2 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 27 Oct 2019 16:48:05 +0100
Subject: [PATCH 13/32] Fix overly aggressive forced player refreshes

---
 src/ext/lib/video-data/VideoData.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ext/lib/video-data/VideoData.js b/src/ext/lib/video-data/VideoData.js
index 8fbebd9..3ec36cc 100644
--- a/src/ext/lib/video-data/VideoData.js
+++ b/src/ext/lib/video-data/VideoData.js
@@ -137,8 +137,9 @@ class VideoData {
       const pw = +(pcs.width.split('px')[0]);
 
       // TODO: check & account for panning and alignment
-      if (this.isWithin(vh, (ph - (translateY / 2)), 2)
-          && this.isWithin(vw, (pw - (translateX / 2)), 2)) {
+      if (transformMatrix[0] !== 'none'
+          && this.isWithin(vh, (ph - (translateY * 2)), 2)
+          && this.isWithin(vw, (pw - (translateX * 2)), 2)) {
       } else {
         this.player.forceRefreshPlayerElement();
         this.restoreAr();

From 6af771e1ff9c04a8a8c2c562762b9b43696121ad Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 27 Oct 2019 16:51:31 +0100
Subject: [PATCH 14/32] Restrict which kind of mutation events are allowed to
 trigger player refresh

---
 src/ext/lib/video-data/VideoData.js | 34 +++++++++++++++++++----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/ext/lib/video-data/VideoData.js b/src/ext/lib/video-data/VideoData.js
index 3ec36cc..d343f6d 100644
--- a/src/ext/lib/video-data/VideoData.js
+++ b/src/ext/lib/video-data/VideoData.js
@@ -86,21 +86,33 @@ class VideoData {
       }
       return;
     }
+    let confirmAspectRatioRestore = false;
+
     for (let mutation of mutationList) {
-      if (mutation.type === 'attributes' 
-          && mutation.attributeName === 'class'
-          && !context.video.classList.contains(this.userCssClassName) ) {
-        // force the page to include our class in classlist, if the classlist has been removed
-        // while classList.add() doesn't duplicate classes (does nothing if class is already added),
-        // we still only need to make sure we're only adding our class to classlist if it has been
-        // removed. classList.add() will _still_ trigger mutation (even if classlist wouldn't change).
-        // This is a problem because INFINITE RECURSION TIME, and we _really_ don't want that.
-      
-        context.video.classList.add(this.userCssClassName);  
-        break;
+      if (mutation.type === 'attributes') {
+        if (mutation.attributeName === 'class') {
+          if(!context.video.classList.contains(this.userCssClassName) ) {
+            // force the page to include our class in classlist, if the classlist has been removed
+            // while classList.add() doesn't duplicate classes (does nothing if class is already added),
+            // we still only need to make sure we're only adding our class to classlist if it has been
+            // removed. classList.add() will _still_ trigger mutation (even if classlist wouldn't change).
+            // This is a problem because INFINITE RECURSION TIME, and we _really_ don't want that.
+            context.video.classList.add(this.userCssClassName);  
+          }
+          // always trigger refresh on class changes, since change of classname might trigger change 
+          // of the player size as well.
+          confirmAspectRatioRestore = true;
+        }
+        if (mutation.attributeName === 'style') {
+          confirmAspectRatioRestore = true;
+        }
       }
     }
 
+    if (!confirmAspectRatioRestore) {
+      return;
+    }
+
     // adding player observer taught us that if element size gets triggered by a class, then
     // the 'style' attributes don't necessarily trigger. This means we also need to trigger
     // restoreAr here, in case video size was changed this way

From bde7eb6327bb5ae79f3ae4a84e4966b6c5fe79bd Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 27 Oct 2019 16:51:47 +0100
Subject: [PATCH 15/32] Fix autodetecting not starting

---
 src/ext/lib/video-data/PageInfo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ext/lib/video-data/PageInfo.js b/src/ext/lib/video-data/PageInfo.js
index f4a8a0c..6e055a9 100644
--- a/src/ext/lib/video-data/PageInfo.js
+++ b/src/ext/lib/video-data/PageInfo.js
@@ -214,7 +214,7 @@ class PageInfo {
           try {
             v = new VideoData(video, this.settings, this);
 
-            if (this.defaultCrop) {
+            if (!this.defaultCrop) {
               if (!v.invalid) {
                 v.initArDetection();
               } else {

From 2422cec1e918b369a8ddb6823b4ed6d3a8e59c1c Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 27 Oct 2019 22:08:48 +0100
Subject: [PATCH 16/32] update formatting

---
 src/ext/lib/video-transform/Stretcher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ext/lib/video-transform/Stretcher.js b/src/ext/lib/video-transform/Stretcher.js
index 8894df9..b54f94d 100644
--- a/src/ext/lib/video-transform/Stretcher.js
+++ b/src/ext/lib/video-transform/Stretcher.js
@@ -108,7 +108,7 @@ class Stretcher {
       yFactor: 1
     };
 
-    if(playerAr >= videoAr){
+    if (playerAr >= videoAr){
       // player adds PILLARBOX
 
       if(actualAr >= playerAr){

From 470a7e888371299eccb426d7fd84cda7d29009da Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 27 Oct 2019 22:11:07 +0100
Subject: [PATCH 17/32] Fix video fit on portrait orientations

---
 src/ext/lib/video-transform/Scaler.js | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/ext/lib/video-transform/Scaler.js b/src/ext/lib/video-transform/Scaler.js
index 4cb9ea6..80e4c56 100644
--- a/src/ext/lib/video-transform/Scaler.js
+++ b/src/ext/lib/video-transform/Scaler.js
@@ -120,14 +120,31 @@ class Scaler {
       actualHeight: 0,  // height of the video (excluding letterbox) when <video> tag height is equal to height
     }
   
-    if (fileAr < ar.ratio){
-      // imamo letterbox zgoraj in spodaj -> spremenimo velikost videa (a nikoli širše od ekrana)
-      // letterbox -> change video size (but never to wider than monitor width)
+    if (fileAr < playerAr) {
+      if (fileAr < ar.ratio){
+        // in this situation we have to crop letterbox on top/bottom of the player
+        // we cut it, but never more than the player
         videoDimensions.xFactor = Math.min(ar.ratio, playerAr) / fileAr;
         videoDimensions.yFactor = videoDimensions.xFactor;
+      } else {
+        // in this situation, we would be cutting pillarbox. Inside horizontal player.
+        // I don't think so. Except exceptions, we'll wait for bug reports.
+        videoDimensions.xFactor = 1;
+        videoDimensions.yFactor = 1;
+      }
     } else {
-        videoDimensions.xFactor = fileAr / Math.min(ar.ratio, playerAr);
-        videoDimensions.yFactor = videoDimensions.xFactor;
+      if (fileAr < ar.ratio){
+        // in this situation, we need to add extra letterbox on top of our letterbox
+        // this means we simply don't crop anything _at all_
+          videoDimensions.xFactor = 1;
+          videoDimensions.yFactor = 1;
+      } else {
+          // meant for handling pillarbox crop. not quite implemented.
+          // videoDimensions.xFactor = fileAr / Math.min(ar.ratio, playerAr);
+          // videoDimensions.yFactor = videoDimensions.xFactor;
+          videoDimensions.xFactor = Math.max(ar.ratio, playerAr) * fileAr;
+          videoDimensions.yFactor = videoDimensions.xFactor;
+      }
     }
     
     this.logger.log('info', 'scaler', "[Scaler::calculateCrop] Crop factor calculated — ", videoDimensions.xFactor);

From 83d84e5a93873f2ef73ce5fc956a2a764f6f8531 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 27 Oct 2019 23:20:45 +0100
Subject: [PATCH 18/32] Fix popup not displaying

---
 src/common/mixins/ComputeActionsMixin.js | 8 +++++++-
 src/ext/conf/ExtensionConf.js            | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/common/mixins/ComputeActionsMixin.js b/src/common/mixins/ComputeActionsMixin.js
index 6fd6e5d..d6726ab 100644
--- a/src/common/mixins/ComputeActionsMixin.js
+++ b/src/common/mixins/ComputeActionsMixin.js
@@ -1,7 +1,13 @@
 export default {
   computed: {
     scopeActions: function() {
-      return this.settings.active.actions.filter(x => x.scopes[this.scope] && x.scopes[this.scope].show) || [];
+      return this.settings.active.actions.filter(x => {
+        if (! x.scopes) {
+          console.error('This action does not have a scope.', x);
+          return false;
+        }
+        return x.scopes[this.scope] && x.scopes[this.scope].show
+      }) || [];
     },
     extensionActions: function(){
       return this.scopeActions.filter(x => x.cmd.length === 1 && x.cmd[0].action === 'set-extension-mode') || [];
diff --git a/src/ext/conf/ExtensionConf.js b/src/ext/conf/ExtensionConf.js
index 73d227a..adf08e5 100644
--- a/src/ext/conf/ExtensionConf.js
+++ b/src/ext/conf/ExtensionConf.js
@@ -512,6 +512,8 @@ var ExtensionConf = {
     playerUi: {
       show: true,
       path: 'zoom'
+    },
+    scopes: {
     }
   }, {
     name: 'Hold to pan',

From 9b8e5009272c23b20e0373f98a82025c62769f92 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 27 Oct 2019 23:37:13 +0100
Subject: [PATCH 19/32] Prevent action on contentEditable divs.

---
 src/ext/lib/ActionHandler.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/ext/lib/ActionHandler.js b/src/ext/lib/ActionHandler.js
index 789875e..9db4a2e 100644
--- a/src/ext/lib/ActionHandler.js
+++ b/src/ext/lib/ActionHandler.js
@@ -133,28 +133,32 @@ class ActionHandler {
     // don't do shit on invalid value of state
   }
 
-  preventAction() {
+  preventAction(event) {
     var activeElement = document.activeElement;
 
     if(this.logger.canLog('keyboard')) {
       this.logger.pause(); // temp disable to avoid recursing;
-      
+      const preventAction = this.preventAction();
+      this.logger.resume(); // undisable
+
       this.logger.log('info', 'keyboard', "[ActionHandler::preventAction] Testing whether we're in a textbox or something. Detailed rundown of conditions:\n" +
       "is full screen? (yes->allow):", PlayerData.isFullScreen(),
       "\nis tag one of defined inputs? (yes->prevent):", this.inputs.indexOf(activeElement.tagName.toLocaleLowerCase()) !== -1,
       "\nis role = textbox? (yes -> prevent):", activeElement.getAttribute("role") === "textbox",
       "\nis type === 'text'? (yes -> prevent):", activeElement.getAttribute("type") === "text",
+      "\nevent.target.isContentEditable? (yes -> prevent):", event.target.isContentEditable,
       "\nis keyboard local disabled? (yes -> prevent):", this.keyboardLocalDisabled,
       "\nis keyboard enabled in settings? (no -> prevent)", this.settings.keyboardShortcutsEnabled(window.location.hostname),
-      "\nwill the action be prevented? (yes -> prevent)", this.preventAction(),
+      "\nwill the action be prevented? (yes -> prevent)", preventAction,
       "\n-----------------{ extra debug info }-------------------",
       "\ntag name? (lowercase):", activeElement.tagName, activeElement.tagName.toLocaleLowerCase(),
       "\nrole:", activeElement.getAttribute('role'),
       "\ntype:", activeElement.getAttribute('type'),
-      "insta-fail inputs:", this.inputs
+      "\ninsta-fail inputs:", this.inputs,
+      "\nevent:", event,
+      "\nevent.target:", event.target
       );
 
-      this.logger.resume(); // undisable
     }
 
     // lately youtube has allowed you to read and write comments while watching video in
@@ -175,6 +179,9 @@ class ActionHandler {
     if (activeElement.getAttribute("role") === "textbox") {
       return true;
     }
+    if (event.target.isContentEditable) {
+      return true;
+    }
     if (activeElement.getAttribute("type") === "text") {
       return true;
     }
@@ -265,7 +272,7 @@ class ActionHandler {
   handleKeyup(event) {
     this.logger.log('info', 'keyboard', "%c[ActionHandler::handleKeyup] we pressed a key: ", "color: #ff0", event.key , " | keyup: ", event.keyup, "event:", event);
 
-    if (this.preventAction()) {
+    if (this.preventAction(event)) {
       this.logger.log('info', 'keyboard', "[ActionHandler::handleKeyup] we are in a text box or something. Doing nothing.");
       return;
     }
@@ -276,7 +283,7 @@ class ActionHandler {
   handleKeydown(event) {
     this.logger.log('info', 'keyboard', "%c[ActionHandler::handleKeydown] we pressed a key: ", "color: #ff0", event.key , " | keydown: ", event.keydown, "event:", event)
 
-    if (this.preventAction()) {
+    if (this.preventAction(event)) {
       this.logger.log('info', 'keyboard', "[ActionHandler::handleKeydown] we are in a text box or something. Doing nothing.");
       return;
     }

From 5e20925ec558724b0c6342712972db6853393c0c Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Mon, 28 Oct 2019 20:33:40 +0100
Subject: [PATCH 20/32] Fix fit to width / fit to height for portrait monitors

---
 src/ext/lib/video-transform/Scaler.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ext/lib/video-transform/Scaler.js b/src/ext/lib/video-transform/Scaler.js
index 80e4c56..577eccf 100644
--- a/src/ext/lib/video-transform/Scaler.js
+++ b/src/ext/lib/video-transform/Scaler.js
@@ -133,17 +133,17 @@ class Scaler {
         videoDimensions.yFactor = 1;
       }
     } else {
-      if (fileAr < ar.ratio){
+      if (fileAr < ar.ratio || playerAr < ar.ratio){
         // in this situation, we need to add extra letterbox on top of our letterbox
         // this means we simply don't crop anything _at all_
-          videoDimensions.xFactor = 1;
-          videoDimensions.yFactor = 1;
+        videoDimensions.xFactor = 1;
+        videoDimensions.yFactor = 1;
       } else {
-          // meant for handling pillarbox crop. not quite implemented.
-          // videoDimensions.xFactor = fileAr / Math.min(ar.ratio, playerAr);
-          // videoDimensions.yFactor = videoDimensions.xFactor;
-          videoDimensions.xFactor = Math.max(ar.ratio, playerAr) * fileAr;
-          videoDimensions.yFactor = videoDimensions.xFactor;
+        // meant for handling pillarbox crop. not quite implemented.
+        videoDimensions.xFactor = fileAr / Math.min(ar.ratio, playerAr);
+        videoDimensions.yFactor = videoDimensions.xFactor;
+        // videoDimensions.xFactor = Math.max(ar.ratio, playerAr) * fileAr;
+        // videoDimensions.yFactor = videoDimensions.xFactor;
       }
     }
     

From ab425572835d99b48fa849f955dda8808284b685 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Mon, 28 Oct 2019 22:10:15 +0100
Subject: [PATCH 21/32] Fixes for crop mode persistence on the popup side of
 things

---
 src/ext/conf/ExtensionConf.js             |  2 +-
 src/ext/lib/ActionHandler.js              | 10 ++++++++--
 src/ext/lib/Settings.js                   |  2 +-
 src/popup/js/ExecAction.js                | 12 +++++++++---
 src/popup/panels/DefaultSettingsPanel.vue |  6 +++---
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/ext/conf/ExtensionConf.js b/src/ext/conf/ExtensionConf.js
index adf08e5..b0c3f97 100644
--- a/src/ext/conf/ExtensionConf.js
+++ b/src/ext/conf/ExtensionConf.js
@@ -403,7 +403,7 @@ var ExtensionConf = {
     }
   }, {
     name: 'Persist crop for current session',
-    label: 'Always persist',
+    label: 'Current session',
     cmd: [{
       action: 'set-ar-persistence',
       arg: CropModePersistence.CurrentSession,
diff --git a/src/ext/lib/ActionHandler.js b/src/ext/lib/ActionHandler.js
index 9db4a2e..8b30499 100644
--- a/src/ext/lib/ActionHandler.js
+++ b/src/ext/lib/ActionHandler.js
@@ -158,7 +158,6 @@ class ActionHandler {
       "\nevent:", event,
       "\nevent.target:", event.target
       );
-
     }
 
     // lately youtube has allowed you to read and write comments while watching video in
@@ -256,8 +255,15 @@ class ActionHandler {
               this.settings.active.sites[site].arStatus = cmd.arg;
             } else if (cmd.action === 'set-keyboard') {
               this.settings.active.sites[site].keyboardShortcutsEnabled = cmd.arg;
+            } else if (cmd.action === 'set-ar-persistence') {
+              this.settings.active.sites[site]['cropModePersistence'] = cmd.arg;
+              this.pageInfo.setArPersistence(cmd.arg);
+              this.settings.saveWithoutReload();
+            }
+
+            if (cmd.action !== 'set-ar-persistence') {
+              this.settings.save();
             }
-            this.settings.save();
           }
         }
 
diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 508fca3..4cd3e1c 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -41,7 +41,7 @@ class Settings {
     }
     const parsedSettings = JSON.parse(changes.uwSettings.newValue);
     if(changes['uwSettings'] && changes['uwSettings'].newValue) {
-      ths.setActive(parsedSettings);
+      this.setActive(parsedSettings);
     }
 
     if(!parsedSettings.preventReload && this.updateCallback) {
diff --git a/src/popup/js/ExecAction.js b/src/popup/js/ExecAction.js
index 03cb516..46a60f4 100644
--- a/src/popup/js/ExecAction.js
+++ b/src/popup/js/ExecAction.js
@@ -29,11 +29,11 @@ class ExecAction {
 
         // set-ar-persistence sends stuff to content scripts as well (!)
         // it's important to do that BEFORE the save step
-        if (cmd === 'set-ar-persistence') {
+        if (cmd.action === 'set-ar-persistence') {
           // even when setting global defaults, we only send message to the current tab in
           // order to avoid problems related to 
           const message = {
-            forwardToContentScript: true,
+            forwardToActive: true,
             targetFrame: frame,
             frame: frame,
             cmd: cmd.action,
@@ -65,8 +65,14 @@ class ExecAction {
           this.settings.active.sites[site].autoar = cmd.arg;
         } else if (cmd.action === 'set-keyboard') {
           this.settings.active.sites[site].keyboardShortcutsEnabled = cmd.arg;
+        } else if (cmd.action === 'set-ar-persistence') {
+          this.settings.active.sites[site]['cropModePersistence'] = cmd.arg;
+          this.settings.saveWithoutReload();
+        }
+
+        if (cmd.action !== 'set-ar-persistence') {
+          this.settings.save();
         }
-        this.settings.save();
       }
     }
   }
diff --git a/src/popup/panels/DefaultSettingsPanel.vue b/src/popup/panels/DefaultSettingsPanel.vue
index 4754e8f..afa3229 100644
--- a/src/popup/panels/DefaultSettingsPanel.vue
+++ b/src/popup/panels/DefaultSettingsPanel.vue
@@ -31,7 +31,7 @@
       <div class="flex flex-row flex-wrap">
         <ShortcutButton v-for="(action, index) of aardActions"
                         class="flex flex-grow button"
-                        :class="{'setting-selected': getCurrent('cropModePersistence') === action.cmd[0].arg}"
+                        :class="{'setting-selected': getCurrent('autoar') === action.cmd[0].arg}"
                         :key="index"
                         :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
                         :shortcut="parseShortcut(action)"
@@ -49,8 +49,8 @@
       <div class="label">Persists crop mode <template v-if="scope === 'site'">for {{site}}</template>:</div>
       <div class="flex flex-row flex-wrap">
         <ShortcutButton v-for="(action, index) of cropModePersistenceActions"
-                        class="flex flex-grow button"
-                        :class="{'setting-selected': getCurrent('autoar') === action.cmd[0].arg}"
+                        class="flex flex-grow button b3"
+                        :class="{'setting-selected': getCurrent('cropModePersistence') === action.cmd[0].arg}"
                         :key="index"
                         :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
                         :shortcut="parseShortcut(action)"

From 1c4c4d5652fa678cc9c8c3cfe8697bf402ba997b Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Tue, 29 Oct 2019 00:38:06 +0100
Subject: [PATCH 22/32] update test videos

---
 test/TEST_VIDEOS.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/TEST_VIDEOS.md b/test/TEST_VIDEOS.md
index 50c5ca3..4222363 100644
--- a/test/TEST_VIDEOS.md
+++ b/test/TEST_VIDEOS.md
@@ -1,6 +1,6 @@
 # List of test/sample videos
 
-A quick list of videos where letterbox is encoded in the file.
+A quick list of videos where letterbox is encoded in the file. Inclusion of a video on this list does not imply endorsement of the content expressed by the video or the views expressed by its creator.
 
 ## Vimeo:
 
@@ -34,11 +34,13 @@ https://www.youtube.com/watch?v=L_u97PqWX6g (also dark at the start)
 
 https://www.youtube.com/watch?v=Xr9Oubxw1gA (triggers autocorrection every now and then)
 https://www.youtube.com/watch?v=NaTGwlfRB_c (dark, triggers minor corrections)
+https://www.youtube.com/watch?v=nw5Z93Yt-UQ&t=410 (@ts, dark, resets aspect ratio for no reason within 15s)
 
 ### Watermark stopping AR
 
 https://www.youtube.com/watch?v=tXTFdDrd7pA
 
+
 ### HARD MODE 
 
 For situations that would be _really_ hard to fix (if fix is even possible)

From 18f0c7540b792e08e507b6aa6e364a9215923aa0 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Tue, 29 Oct 2019 18:15:10 +0100
Subject: [PATCH 23/32] Fix incorrect crop resets

---
 src/ext/lib/ar-detect/ArDetector.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ext/lib/ar-detect/ArDetector.js b/src/ext/lib/ar-detect/ArDetector.js
index d68b6c0..8c0c55c 100644
--- a/src/ext/lib/ar-detect/ArDetector.js
+++ b/src/ext/lib/ar-detect/ArDetector.js
@@ -696,14 +696,16 @@ class ArDetector {
     } catch (e) {
       // edges weren't gucci, so we'll just reset 
       // the aspect ratio to defaults
-      try {
-        this.guardline.reset();
-      } catch (e) {
-        // guardline wasn't gucci either, but we'll just ignore
-        // that and reset the aspect ratio anyway
-      }
-      this.conf.resizer.setAr({type: AspectRatio.Automatic, ratio: this.getDefaultAr()});
+      this.logger.log('error', 'arDetect', `%c[ArDetect::frameCheck] There was a problem setting blackbar. Doing nothing. Error:`, e);
+      
+      this.guardline.reset();
+      // WE DO NOT RESET ASPECT RATIO HERE IN CASE OF PROBLEMS, CAUSES UNWARRANTED RESETS: 
+      // (eg. here: https://www.youtube.com/watch?v=nw5Z93Yt-UQ&t=410)
+      //
+      // this.conf.resizer.setAr({type: AspectRatio.Automatic, ratio: this.getDefaultAr()});
     }
+
+    this.clearImageData(imageData);
   }
 
   resetBlackLevel(){

From 42d85f75f7eb9c324701850bd6416c062b19e794 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Tue, 29 Oct 2019 18:15:46 +0100
Subject: [PATCH 24/32] Logging, prepare code for when browsers finally
 implement ArrayBuffer.transfer()

---
 src/ext/lib/ar-detect/ArDetector.js | 13 +++++++++++++
 src/ext/lib/ar-detect/GuardLine.js  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/ext/lib/ar-detect/ArDetector.js b/src/ext/lib/ar-detect/ArDetector.js
index 8c0c55c..9976501 100644
--- a/src/ext/lib/ar-detect/ArDetector.js
+++ b/src/ext/lib/ar-detect/ArDetector.js
@@ -492,6 +492,13 @@ class ArDetector {
     this.conf.resizer.setAr({type: AspectRatio.Automatic, ratio: trueAr}, {type: AspectRatio.Automatic, ratio: trueAr});
   }
 
+  clearImageData(id) {
+    if (ArrayBuffer.transfer) {
+      ArrayBuffer.transfer(id, 0);
+    }
+    id = undefined;
+  }
+
   frameCheck(){
     if(! this.video){
       this.logger.log('error', 'debug', `%c[ArDetect::frameCheck] <@${this.arid}>  Video went missing. Destroying current instance of videoData.`);
@@ -581,6 +588,7 @@ class ArDetector {
 
       this.logger.log('info', 'arDetect_verbose', `%c[ArDetect::frameCheck] Letterbox not detected in fast test. Letterbox is either gone or we manually corrected aspect ratio. Nothing will be done.`, "color: #fa3");
 
+      this.clearImageData(imageData);
       return;
     }
 
@@ -598,6 +606,7 @@ class ArDetector {
     // if both succeed, then aspect ratio hasn't changed.    
     if (!guardLineOut.imageFail && !guardLineOut.blackbarFail) {
       this.logger.log('info', 'arDetect_verbose', `%c[ArDetect::frameCheck] guardLine tests were successful. (no imagefail and no blackbarfail)\n`, "color: #afa", guardLineOut);
+      this.clearImageData(imageData);
       return;
     }
 
@@ -617,6 +626,7 @@ class ArDetector {
       this.guardLine.reset();
       this.noLetterboxCanvasReset = true;
 
+      this.clearImageData(imageData);
       return;
     }
          
@@ -643,6 +653,7 @@ class ArDetector {
 
           triggerTimeout = this.getTimeout(baseTimeout, startTime);
           this.scheduleFrameCheck(triggerTimeout);
+          this.clearImageData(imageData);
           return;
         }
       }
@@ -664,6 +675,8 @@ class ArDetector {
       // rob ni bil zaznan, zato ne naredimo ničesar.
       // no edge was detected. Let's leave things as they were
       this.logger.log('info', 'arDetect_verbose', `%c[ArDetect::frameCheck] Edge wasn't detected with findBars`, "color: #fa3", edgePost, "EdgeStatus.AR_KNOWN:", EdgeStatus.AR_KNOWN);
+
+      this.clearImageData(imageData);
       return;
     }
 
diff --git a/src/ext/lib/ar-detect/GuardLine.js b/src/ext/lib/ar-detect/GuardLine.js
index ca03448..de95cf6 100644
--- a/src/ext/lib/ar-detect/GuardLine.js
+++ b/src/ext/lib/ar-detect/GuardLine.js
@@ -34,7 +34,7 @@ class GuardLine {
     // to odstrani vse neveljavne nastavitve in vse možnosti, ki niso smiselne
     // this removes any configs with invalid values or values that dont make sense
     if (bbTop < 0 || bbBottom >= this.conf.canvas.height ){
-      throw "INVALID_SETTINGS_IN_GUARDLINE"
+      throw {error: "INVALID_SETTINGS_IN_GUARDLINE", bbTop, bbBottom}
     }
 
     this.blackbar = {

From 04c33956a192cc264f9e37cc558d99a3d09e91da Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Wed, 30 Oct 2019 17:47:15 +0100
Subject: [PATCH 25/32] changelog update

---
 CHANGELOG.md                       |  2 ++
 src/ext/uw.js                      | 24 ++++++++++++------------
 src/popup/panels/WhatsNewPanel.vue |  2 ++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac632d1..198bd44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ QoL improvements for me:
 * Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, without having to rebind them manually. (Only applicable for new installs — existing users need to reset settings to default in extension settings)
 * NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.
 * Ability to preserve aspect ratio between different videos (applies to current page and doesn't survive proper page reloads)
+* Fixed bug where keyboard shortcuts would work while typing in certain text fields
+* Fixed minor bug with autodetection
 
 ### v4.3.1 (current)
 
diff --git a/src/ext/uw.js b/src/ext/uw.js
index c9b5426..e7bb6f8 100644
--- a/src/ext/uw.js
+++ b/src/ext/uw.js
@@ -44,26 +44,26 @@ class UW {
       if (!this.logger) {
         const loggingOptions = {
           logToFile: false,
-          logToConsole: false,
+          logToConsole: true,
           fileOptions: {
             // really the same stuff as consoleOptions
           },
           consoleOptions: {
             enabled: true, // if logging is enabled at all
-            'debug': true,
-            'init': true,
-            'settings': true,
-            'keyboard': false,
-            'mousemove': false,
-            'actionHandler': false,
-            'comms': false,
-            'playerDetect': false,
+            // 'debug': true,
+            // 'init': true,
+            // 'settings': true,
+            // 'keyboard': true,
+            // 'mousemove': false,
+            // 'actionHandler': false,
+            // 'comms': false,
+            // 'playerDetect': false,
             // 'resizer': true,
             // 'scaler': true,
             // 'stretcher': true,
-            'videoRescan': false,
-            'arDetect': false,
-            'arDetect_verbose': false,
+            // 'videoRescan': false,
+            // 'arDetect': true,
+            // 'arDetect_verbose': true,
           }
         };      
         this.logger = new Logger(loggingOptions);
diff --git a/src/popup/panels/WhatsNewPanel.vue b/src/popup/panels/WhatsNewPanel.vue
index 33d0ae0..261ce4b 100644
--- a/src/popup/panels/WhatsNewPanel.vue
+++ b/src/popup/panels/WhatsNewPanel.vue
@@ -10,6 +10,8 @@
       <li>NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.</li>
       <li>Ability to preserve aspect ratio between different videos (applies to current page and doesn't survive proper 
           page reloads)</li>
+      <li>Fixed bug where keyboard shortcuts would work while typing in certain text fields</li>
+      <li>Fixed a minor bug with autodetection</li>
     </ul>
   </div>
 </template>

From 5becf0bdf0092f8f86e0add6bad4d39f585d7c59 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Fri, 1 Nov 2019 23:51:51 +0100
Subject: [PATCH 26/32] Version bump is gonna be a bit more major

---
 CHANGELOG.md                       | 2 +-
 package.json                       | 2 +-
 src/manifest.json                  | 2 +-
 src/popup/panels/WhatsNewPanel.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 198bd44..12f3312 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ QoL improvements for me:
 
 * logging: allow to enable logging at will and export said logs to a file
 
-### v.4.3.2 (future)
+### v.4.4.0 (future)
 
 * Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, without having to rebind them manually. (Only applicable for new installs — existing users need to reset settings to default in extension settings)
 * NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.
diff --git a/package.json b/package.json
index ecc1d19..9e6f7c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ultravidify",
-  "version": "4.3.2",
+  "version": "4.4.0",
   "description": "Aspect ratio fixer for youtube that works around some people's disability to properly encode 21:9 (and sometimes, 16:9) videos.",
   "author": "Tamius Han <tamius.han@gmail.com>",
   "scripts": {
diff --git a/src/manifest.json b/src/manifest.json
index ad0f111..76e73a2 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Ultrawidify",
   "description": "Removes black bars on ultrawide videos and offers advanced options to fix aspect ratio.",
-  "version": "4.3.2",
+  "version": "4.4.0",
   "applications": {
     "gecko": {
       "id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}"
diff --git a/src/popup/panels/WhatsNewPanel.vue b/src/popup/panels/WhatsNewPanel.vue
index 261ce4b..ded166a 100644
--- a/src/popup/panels/WhatsNewPanel.vue
+++ b/src/popup/panels/WhatsNewPanel.vue
@@ -2,7 +2,7 @@
   <div>
     <h2>What's new</h2>
     <p>Full changelog for older versions <a href="https://github.com/xternal7/ultrawidify/blob/master/CHANGELOG.md">is available here</a>.</p>
-    <p class="label">4.3.2</p>
+    <p class="label">4.4.0</p>
     <ul>
       <li>Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, 
           without having to rebind them manually. <b>NOTE: Only applicable for new installs — existing users need to reset 

From dbc35ccbd176e0ed3f31b9f27d993189f594f584 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sat, 2 Nov 2019 01:05:36 +0100
Subject: [PATCH 27/32] Patching for v4.4.0

---
 src/ext/conf/ExtConfPatches.js        | 125 ++++++++++++++++++++++++++
 src/ext/conf/ExtensionConf.js         |   4 +-
 src/ext/lib/Settings.js               |  28 ++++--
 src/options/SuperAdvancedSettings.vue |   2 +-
 4 files changed, 151 insertions(+), 8 deletions(-)

diff --git a/src/ext/conf/ExtConfPatches.js b/src/ext/conf/ExtConfPatches.js
index 6400829..4c2ff52 100644
--- a/src/ext/conf/ExtConfPatches.js
+++ b/src/ext/conf/ExtConfPatches.js
@@ -117,7 +117,132 @@ const ExtensionConfPatch = [
         }
       }
     }
+  }, {
+    forVersion: '4.4.0',
+    updateFn: (userOptions, defaultOptions) => {
+      // remove 'press P to toggle panning mode' thing
+      const togglePan = userOptions.actions.find(x => x.cmd && x.cmd.length === 1 && x.cmd[0].action === 'toggle-pan');
+      if (togglePan) { 
+        togglePan.scopes = {};
+      }
+
+      // add new actions
+      userOptions.actions.push({
+        name: 'Don\'t persist crop',
+        label: 'Never persist',
+        cmd: [{
+          action: 'set-ar-persistence',
+          arg: 0,
+        }],
+        scopes: {
+          site: {
+            show: true,
+          },
+          global: {
+            show: true,
+          }
+        },
+        playerUi: {
+          show: true,
+        }
+      }, {
+        name: 'Persist crop while on page',
+        label: 'Until page load',
+        cmd: [{
+          action: 'set-ar-persistence',
+          arg: 1,
+        }],
+        scopes: {
+          site: {
+            show: true,
+          },
+          global: {
+            show: true,
+          }
+        },
+        playerUi: {
+          show: true,
+        }
+      }, {
+        name: 'Persist crop for current session',
+        label: 'Current session',
+        cmd: [{
+          action: 'set-ar-persistence',
+          arg: 2,
+        }],
+        scopes: {
+          site: {
+            show: true,
+          },
+          global: {
+            show: true,
+          }
+        },
+        playerUi: {
+          show: true,
+        }
+      }, {
+        name: 'Persist until manually reset',
+        label: 'Always persist',
+        cmd: [{
+          action: 'set-ar-persistence',
+          arg: 3,
+        }],
+        scopes: {
+          site: {
+            show: true,
+          },
+          global: {
+            show: true,
+          }
+        },
+        playerUi: {
+          show: true,
+        }
+      }, {
+        name: 'Default crop persistence',
+        label: 'Default',
+        cmd: [{
+          action: 'set-ar-persistence',
+          arg: -1,
+        }],
+        scopes: {
+          site: {
+            show: true,
+          },
+        },
+        playerUi: {
+          show: true,
+        }
+      });
+      
+      // patch shortcuts for non-latin layouts, but only if the user hasn't changed default keys
+      for (const action of userOptions.actions) {
+        if (!action.cmd || action.cmd.length !== 1) {
+          continue;
+        }
+        try {
+          // if this fails, then action doesn't have keyboard shortcut associated with it, so we skip it
+
+          const actionDefaults = defaultOptions.actions.find(x => x.cmd && x.cmd.length === 1  // (redundant, default actions have exactly 1 cmd in array)
+                                                                        && x.cmd[0].action === action.cmd[0].action
+                                                                        && x.scopes.page
+                                                                        && x.scopes.page.shortcut
+                                                                        && x.scopes.page.shortcut.length === 1
+                                                                        && x.scopes.page.shortcut[0].key === action.scopes.page.shortcut[0].key // this can throw exception, and it's okay
+                                                             );
+          if (actionDefaults === undefined) {
+            continue;
+          }
+          // update 'code' property for shortcut
+          action.scopes.page.shortcut[0]['code'] = actionDefaults.scopes.page.shortcut[0].code;
+        } catch (e) {
+          continue;
+        }
+      }
+    }
   }
 ];
 
+
 export default ExtensionConfPatch;
\ No newline at end of file
diff --git a/src/ext/conf/ExtensionConf.js b/src/ext/conf/ExtensionConf.js
index b0c3f97..f014e23 100644
--- a/src/ext/conf/ExtensionConf.js
+++ b/src/ext/conf/ExtensionConf.js
@@ -385,7 +385,7 @@ var ExtensionConf = {
     }
   }, {
     name: 'Persist crop while on page',
-    label: 'While on page',
+    label: 'Until page load',
     cmd: [{
       action: 'set-ar-persistence',
       arg: CropModePersistence.UntilPageReload,
@@ -438,7 +438,7 @@ var ExtensionConf = {
       show: true,
     }
   }, {
-    name: 'Default persistence',
+    name: 'Default crop persistence',
     label: 'Default',
     cmd: [{
       action: 'set-ar-persistence',
diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 4cd3e1c..9c4478b 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -144,13 +144,29 @@ class Settings {
     // apply all remaining patches
     this.logger.log('info', 'settings', `[Settings::applySettingsPatches] There are ${patches.length - index} settings patches to apply`);
     while (index < patches.length) {
+      const updateFn = patches[index].updateFn;
       delete patches[index].forVersion;
-      ObjectCopy.overwrite(this.active, patches[index]);
+      delete patches[index].updateFn;
+      
+      if (Object.keys(patches[index]).length > 0) {
+        ObjectCopy.overwrite(this.active, patches[index]);
+      }
+      if (updateFn) {
+
+        try {
+          updateFn(this.active, this.getDefaultSettings());
+        } catch (e) {
+          console.log("!!!!", e)
+          this.logger.log('error', 'settings', '[Settings::applySettingsPatches] Failed to execute update function. Keeping settings object as-is. Error:', e);
+        }
+      }
+
       index++;
     }
   }
 
   async init() {
+    console.log("settngs init")
     const settings = await this.get();
     this.version = this.getExtensionVersion();
 
@@ -267,8 +283,10 @@ class Settings {
     }
   }
 
-  async set(extensionConf) {
-    extensionConf.version = this.version;
+  async set(extensionConf, options) {
+    if (!options || !options.forcePreserveVersion) {
+      extensionConf.version = this.version;
+    }
 
     this.logger.log('info', 'settings', "[Settings::set] setting new settings:", extensionConf)
 
@@ -287,12 +305,12 @@ class Settings {
     this.active[prop] = value;
   }
 
-  async save() {
+  async save(options) {
     if (Debug.debug && Debug.storage) {
       console.log("[Settings::save] Saving active settings:", this.active);
     }
     this.active.preventReload = undefined;
-    await this.set(this.active);
+    await this.set(this.active, options);
   }
 
 
diff --git a/src/options/SuperAdvancedSettings.vue b/src/options/SuperAdvancedSettings.vue
index 5b4c3ba..111631f 100644
--- a/src/options/SuperAdvancedSettings.vue
+++ b/src/options/SuperAdvancedSettings.vue
@@ -70,7 +70,7 @@ export default {
       if (this.hasError) {
         return;
       }
-      this.settings.save();
+      this.settings.save({forcePreserveVersion: true});
       // this.parsedSettings = JSON.stringify(this.settings.active, null, 2);
       // this.lastSettings = JSON.parse(JSON.stringify(this.settings.active));
       const ths = this;

From b128f97a7c4accfb6e7ea187c25bbc4f0f5041df Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sat, 2 Nov 2019 01:11:57 +0100
Subject: [PATCH 28/32] Fixed readme

---
 CHANGELOG.md                       | 2 +-
 src/popup/panels/WhatsNewPanel.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12f3312..dc9cf57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ QoL improvements for me:
 
 ### v.4.4.0 (future)
 
-* Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, without having to rebind them manually. (Only applicable for new installs — existing users need to reset settings to default in extension settings)
+* Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, without having to rebind them manually. (NOTE: if you've changed keyboard shortcuts manually, this change will ***NOT*** be applied to your configuration.)
 * NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.
 * Ability to preserve aspect ratio between different videos (applies to current page and doesn't survive proper page reloads)
 * Fixed bug where keyboard shortcuts would work while typing in certain text fields
diff --git a/src/popup/panels/WhatsNewPanel.vue b/src/popup/panels/WhatsNewPanel.vue
index ded166a..5011014 100644
--- a/src/popup/panels/WhatsNewPanel.vue
+++ b/src/popup/panels/WhatsNewPanel.vue
@@ -5,8 +5,8 @@
     <p class="label">4.4.0</p>
     <ul>
       <li>Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, 
-          without having to rebind them manually. <b>NOTE: Only applicable for new installs — existing users need to reset 
-          settings to default in extension settings</b></li>
+          without having to rebind them manually. <b>NOTE: this change will only be applied to users who have <i>NOT</i>
+          modified their keyboard shortcuts.</b></li>
       <li>NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.</li>
       <li>Ability to preserve aspect ratio between different videos (applies to current page and doesn't survive proper 
           page reloads)</li>

From f806d154ee4e62fa31f2e51c491f61e6351aa011 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sat, 2 Nov 2019 02:20:09 +0100
Subject: [PATCH 29/32] Fix panning

---
 src/ext/lib/ActionHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ext/lib/ActionHandler.js b/src/ext/lib/ActionHandler.js
index 8b30499..4685219 100644
--- a/src/ext/lib/ActionHandler.js
+++ b/src/ext/lib/ActionHandler.js
@@ -217,7 +217,7 @@ class ActionHandler {
   execAction(actions, event, videoData) {
     this.logger.log('info', 'keyboard', "%c[ActionHandler::execAction] Trying to find and execute action for event. Actions/event: ", "color: #ff0", actions, event);
 
-    const isLatin = this.isLatin(event.key);
+    const isLatin = event.key ? this.isLatin(event.key) : true;
 
     for (var action of actions) {
       if (this.isActionMatch(action.shortcut, event, isLatin)) {

From 83a4dd08ac817a2bca445f14bc21f6e09842b688 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sat, 2 Nov 2019 02:21:13 +0100
Subject: [PATCH 30/32] remove console litter

---
 src/ext/lib/Settings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 9c4478b..173f380 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -166,7 +166,6 @@ class Settings {
   }
 
   async init() {
-    console.log("settngs init")
     const settings = await this.get();
     this.version = this.getExtensionVersion();
 

From 970b9b6b1d60eefa9caf0e54a52114e1dd336de7 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sat, 2 Nov 2019 02:45:24 +0100
Subject: [PATCH 31/32] Reset panning on aspect ratio change.

---
 src/ext/lib/video-transform/Resizer.js | 23 +++++++++++++++++++++++
 src/ext/lib/video-transform/Zoom.js    |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/src/ext/lib/video-transform/Resizer.js b/src/ext/lib/video-transform/Resizer.js
index f0dea5a..7cecc69 100644
--- a/src/ext/lib/video-transform/Resizer.js
+++ b/src/ext/lib/video-transform/Resizer.js
@@ -133,6 +133,17 @@ class Resizer {
 
     const siteSettings = this.settings.active.sites[window.location.host];
 
+    // reset zoom, but only on aspect ratio switch. We also know that aspect ratio gets converted to
+    // AspectRatio.Fixed when zooming, so let's keep that in mind
+    if (ar.type !== AspectRatio.Fixed) {
+      this.zoom.reset();
+      this.resetPan();
+    } else if (ar.ratio !== this.lastAr.ratio) {
+      // we must check against this.lastAR.ratio because some calls provide same value for ar and lastAr
+      this.zoom.reset();
+      this.resetPan();
+    }
+
     // most everything that could go wrong went wrong by this stage, and returns can happen afterwards
     // this means here's the optimal place to set or forget aspect ratio. Saving of current crop ratio
     // is handled in pageInfo.updateCurrentCrop(), which also makes sure to persist aspect ratio if ar
@@ -263,6 +274,10 @@ class Resizer {
 
   }
 
+  toFixedAr() {
+    this.lastAr.type = AspectRatio.Fixed;
+  }
+
   resetLastAr() {
     this.lastAr = {type: AspectRatio.Initial};
   }
@@ -288,6 +303,9 @@ class Resizer {
       // dont allow weird floats
       this.videoAlignment = VideoAlignment.Center;
 
+      // because non-fixed aspect ratios reset panning:
+      this.toFixedAr();
+
       const player = this.conf.player.element;
 
       const relativeX = (event.pageX - player.offsetLeft) / player.offsetWidth;
@@ -299,6 +317,11 @@ class Resizer {
     }
   }
 
+  resetPan() {
+    this.pan = {};
+    this.videoAlignment = this.settings.getDefaultVideoAlignment(window.location.host);
+  }
+
   setPan(relativeMousePosX, relativeMousePosY){
     // relativeMousePos[X|Y] - on scale from 0 to 1, how close is the mouse to player edges. 
     // use these values: top, left: 0, bottom, right: 1
diff --git a/src/ext/lib/video-transform/Zoom.js b/src/ext/lib/video-transform/Zoom.js
index b14c30b..b95bb1e 100644
--- a/src/ext/lib/video-transform/Zoom.js
+++ b/src/ext/lib/video-transform/Zoom.js
@@ -18,6 +18,7 @@ class Zoom {
 
   reset(){
     this.scale = 1;
+    this.logScale = 0;
   }
 
   zoomStep(amount){
@@ -34,6 +35,8 @@ class Zoom {
 
     this.logger.log('info', 'debug', "[Zoom::zoomStep] changing zoom by", amount, ". New zoom level:", this.scale);
 
+    this.conf.resizer.toFixedAr();
+
     this.conf.restoreAr();
     this.conf.announceZoom(this.scale);
   }

From 0e09ae771c8f19bbc023e811ac13f1e4351a4c46 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sat, 2 Nov 2019 02:45:30 +0100
Subject: [PATCH 32/32] Update readme

---
 CHANGELOG.md                       | 5 +++--
 src/popup/panels/WhatsNewPanel.vue | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc9cf57..346b51d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,15 +12,16 @@ QoL improvements for me:
 
 * logging: allow to enable logging at will and export said logs to a file
 
-### v.4.4.0 (future)
+### v.4.4.0 (current)
 
 * Russian users (and users of other non-latin keyboard layouts) can now use keyboard shortcuts by default, without having to rebind them manually. (NOTE: if you've changed keyboard shortcuts manually, this change will ***NOT*** be applied to your configuration.)
 * NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.
 * Ability to preserve aspect ratio between different videos (applies to current page and doesn't survive proper page reloads)
+* Changing aspect ratio now resets zooming and panning.
 * Fixed bug where keyboard shortcuts would work while typing in certain text fields
 * Fixed minor bug with autodetection
 
-### v4.3.1 (current)
+### v4.3.1
 
 * Minor rework of settings page (actions & shortcuts section)
 * Fixed bug that prevented settings page from opening
diff --git a/src/popup/panels/WhatsNewPanel.vue b/src/popup/panels/WhatsNewPanel.vue
index 5011014..23988e0 100644
--- a/src/popup/panels/WhatsNewPanel.vue
+++ b/src/popup/panels/WhatsNewPanel.vue
@@ -10,6 +10,7 @@
       <li>NOTE: when using non-latin layouts, 'zoom' shortcut (`z` by default) uses the position of 'Y' on QWERTY layout.</li>
       <li>Ability to preserve aspect ratio between different videos (applies to current page and doesn't survive proper 
           page reloads)</li>
+      <li>Changing aspect ratio now resets zooming and panning.</li>
       <li>Fixed bug where keyboard shortcuts would work while typing in certain text fields</li>
       <li>Fixed a minor bug with autodetection</li>
     </ul>