Merge branch 'master' into stable

CHANGELOG.md

@@ -6,8 +6,10 @@
 
 * Settings page looks ugly af right now. Maybe fix it some time later
 
+### v4.2.1 (current)
+* Fixed bug where custom CSS didn't get applied to pages
 
-### v4.2.0
+### v4.2.0 
 
 * Slightly improved popup design. (Design change suggested by PortaTrekos)
 * Player detection: youtube and twitch now have manual player element detection, with strictly defined players. 
@@ -16,7 +18,7 @@
 * Fixed imcompatibilities with Iridium. Flicker when clicking play/pause or switching between big and popup player is caused by either Youtube or Iridium trying to apply their styles over mine.
 * Issues with inconsistent alignment that some people reported are potentially fixed
 
-### v4.1.2 (current)
+### v4.1.2 
 
 * Fixed video alignment issues on www.reddit as well (for people who use old reddit without going to old.reddit)
 * Fixed bug with 'player detection' tab

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultravidify",
-  "version": "4.1.2",
+  "version": "4.2.1",
   "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": {

src/ext/conf/ExtConfPatches.js

@@ -2,6 +2,43 @@
 // version: {ExtensionConf object, but only properties that get overwritten}
 
 const ExtensionConfPatch = {
+  '4.2.1': {
+    sites: {
+      "old.reddit.com" : {
+        type: 'testing',
+        DOM: {
+          player: {
+            manual: true,
+            useRelativeAncestor: false,
+            querySelectors: '.media-preview-content'
+          }
+        },
+        css: '',
+      },
+      "www.reddit.com" : {
+        type: 'testing',
+        DOM: {
+          player: {
+            manual: true,
+            useRelativeAncestor: false,
+            querySelectors: '.media-preview-content'
+          }
+        },
+        css: '',
+      },
+      "www.youtube.com" : {
+        DOM: {
+          player: {
+            manual: true,
+            querySelectors: "#movie_player, #player",
+            additionalCss: "",
+            useRelativeAncestor: false,
+            playerNodeCss: "",
+          }
+        }
+      },
+    }
+  },
   '4.2.0': {
     sites: {
       "old.reddit.com" : {

src/ext/lib/Interface.js

@@ -5,12 +5,8 @@ class Interface {
   }
 
   injectUi() {
-    
     this.detectorDiv = document.createElement('div');
     this.uiRoot = document.createElement('div');
     this.detectorDiv.appendChild(this.uiRoot);
-
-    
-
   }
 }

src/ext/lib/video-data/PageInfo.js

@@ -24,6 +24,17 @@ class PageInfo {
       this.comms = comms;
     }
 
+    // request inject css immediately
+    try {
+      const playerStyleString = this.settings.active.sites[window.location.host].css.replace('\\n', '');
+      this.comms.sendMessage({
+        cmd: 'inject-css',
+        cssString: playerStyleString
+      });
+    } catch (e) {
+      // do nothing. It's ok if there's no special settings for the player element
+    }
+
     this.rescan(RescanReason.PERIODIC);
     this.scheduleUrlCheck();
 

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.2.0",
+  "version": "4.2.1",
   "applications": {
     "gecko": {
       "id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}"

src/popup/panels/WhatsNewPanel.vue

@@ -2,9 +2,10 @@
   <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.2.0</p>
+    <p class="label">4.2.0 and 4.2.1</p>
     <ul>
-      <li>Slightly improved popup design. (Design change suggested by PortaTrekos)
+      <li>Fixed the issue where user-defined CSS didn't get applied to websites. Issue mainly affected vimeo.</li>
+      <li>Slightly improved popup design. (Design change suggested by PortaTrekos)</li>
       <li>Improved site settings control in extension popup. It's possible to enable extension for previously disabled embedded sites.</li>
       <li>Improved incompatibilities with reddit, where videos would be vertically misaligned when not using RES</li>
       <li>Fixed imcompatibilities with Iridium. Flicker when clicking play/pause or switching between big and popup player is caused by either Youtube or Iridium trying to apply their styles over mine.</li>