From ce058d9b314f72b34fd6a84719575fa0f9341694 Mon Sep 17 00:00:00 2001
From: Marvin Alexander Krebber <marvinkrebber@yahoo.de>
Date: Thu, 17 Oct 2024 14:20:39 +0200
Subject: [PATCH] Popup not working on edge and chrome

---
 chrome/manifest.json        |  2 +-
 chrome/popup/popup.html     |  7 ++++---
 chrome/popup/settings.css   |  3 ++-
 chrome/popup/settings.html  |  7 ++++---
 chrome/skipper.js           |  2 +-
 firefox/manifest.json       |  2 +-
 firefox/popup/popup.html    |  4 ++--
 firefox/popup/settings.css  |  2 +-
 firefox/popup/settings.html | 10 ++++++++--
 firefox/skipper.js          |  2 +-
 package.json                |  2 +-
 11 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/chrome/manifest.json b/chrome/manifest.json
index 4179f98a..583daa06 100644
--- a/chrome/manifest.json
+++ b/chrome/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.1.41",
+  "version": "1.1.42",
 
   "homepage_url": "https://github.com/Dreamlinerm/Netflix-Prime-Auto-Skip",
   "icons": {
diff --git a/chrome/popup/popup.html b/chrome/popup/popup.html
index 7649575d..69d36d64 100644
--- a/chrome/popup/popup.html
+++ b/chrome/popup/popup.html
@@ -20,7 +20,7 @@
   <!--  import "https://fonts.googleapis.com/css?family=Lato"; -->
   <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
   <script src="settings.js" defer></script>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="viewport" content="width=device-width, initial-scale=0.8">
   <title>Popup</title>
 </head>
 
@@ -32,13 +32,14 @@
         <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" alt="Logo">
         <div class="flex-center flex-col">
           <h2 class="title" data-i18n>pageTitle</h2>
-          <p style="color: grey; font-size: 1em">v.1.1.41</p>
+          <p style="color: grey; font-size: 1em">v.1.1.42</p>
         </div>
       </div>
       <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none"
         href="https://chrome.google.com/webstore/detail/netflixprime-auto-skip/akaimhgappllmlkadblbdknhbfghdgle">
         <p style="font-size: 1em" data-i18n>rateNow</p>
-        <img src="https://img.shields.io/chrome-web-store/stars/akaimhgappllmlkadblbdknhbfghdgle?color=e60010" alt="rating">
+        <img src="https://img.shields.io/chrome-web-store/stars/akaimhgappllmlkadblbdknhbfghdgle?color=e60010"
+          alt="rating">
       </a>
       <div class="flex flex-row">
         <a class="flex flex-center" style="font-size: 1.5em;"
diff --git a/chrome/popup/settings.css b/chrome/popup/settings.css
index 9efcf90c..f3839922 100644
--- a/chrome/popup/settings.css
+++ b/chrome/popup/settings.css
@@ -26,7 +26,7 @@ h6 {
 html,
 body,
 .content {
-  /* width: 500px; */
+  min-width: 500px;
   min-height: 450px;
   background-color: #212121;
 }
@@ -226,6 +226,7 @@ input:checked + .slider:before {
 
 .popupMenuButton {
   flex: 1 0 calc(25% - 30px);
+  max-width: calc(25% - 20px);
   border-radius: 15px;
   padding: 20px;
   margin: 10px;
diff --git a/chrome/popup/settings.html b/chrome/popup/settings.html
index da996880..1cd845e2 100644
--- a/chrome/popup/settings.html
+++ b/chrome/popup/settings.html
@@ -30,13 +30,14 @@
         <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" alt="Logo">
         <div class="flex-center flex-col">
           <h2 class="title" data-i18n>pageTitle</h2>
-          <p style="font-size: 1em">v.1.1.41</p>
+          <p style="font-size: 1em">v.1.1.42</p>
         </div>
       </div>
       <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none"
         href="https://chrome.google.com/webstore/detail/netflixprime-auto-skip/akaimhgappllmlkadblbdknhbfghdgle">
         <p style="font-size: 1em" data-i18n>rateNow</p>
-        <img src="https://img.shields.io/chrome-web-store/stars/akaimhgappllmlkadblbdknhbfghdgle?color=e60010" alt="rating">
+        <img src="https://img.shields.io/chrome-web-store/stars/akaimhgappllmlkadblbdknhbfghdgle?color=e60010"
+          alt="rating">
       </a>
     </div>
     <div class="flex flex-col MenuButtons" style="flex-wrap: wrap">
@@ -735,7 +736,7 @@ <h2 data-i18n>ImportSettings</h2>
         <h2>Changelog</h2>
         <div>
           <div class="line flex">
-            <h2>1.1.41</h2>
+            <h2>1.1.42</h2>
             <ul>
               <li>Block Disney Ads</li>
             </ul>
diff --git a/chrome/skipper.js b/chrome/skipper.js
index 132bea54..11481ec5 100644
--- a/chrome/skipper.js
+++ b/chrome/skipper.js
@@ -29,7 +29,7 @@ const isMobile = /mobile|streamingEnhanced/i.test(ua);
 const isEdge = /edg/i.test(ua);
 // const isFirefox = /firefox/i.test(ua);
 // const isChrome = /chrome/i.test(ua);
-const version = "1.1.41";
+const version = "1.1.42";
 if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll || isHBO) {
   /* eslint-env root:true */
   // global variables in localStorage
diff --git a/firefox/manifest.json b/firefox/manifest.json
index c9b6f6be..26b51e9d 100644
--- a/firefox/manifest.json
+++ b/firefox/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.1.41",
+  "version": "1.1.42",
   "homepage_url": "https://github.com/Dreamlinerm/Netflix-Prime-Auto-Skip",
   "icons": {
     "16": "icons/NetflixAmazon Auto-Skip.svg",
diff --git a/firefox/popup/popup.html b/firefox/popup/popup.html
index 52f365b4..482c68b5 100644
--- a/firefox/popup/popup.html
+++ b/firefox/popup/popup.html
@@ -20,7 +20,7 @@
   <!--  import "https://fonts.googleapis.com/css?family=Lato"; -->
   <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
   <script src="settings.js" defer></script>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="viewport" content="width=500px, initial-scale=1">
   <title>Popup</title>
 </head>
 
@@ -32,7 +32,7 @@
         <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" alt="Logo">
         <div class="flex-center flex-col">
           <h2 class="title" data-i18n>pageTitle</h2>
-          <p style="color: grey; font-size: 1em">v.1.1.41</p>
+          <p style="color: grey; font-size: 1em">v.1.1.42</p>
         </div>
       </div>
       <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none"
diff --git a/firefox/popup/settings.css b/firefox/popup/settings.css
index 9efcf90c..2c3e89fc 100644
--- a/firefox/popup/settings.css
+++ b/firefox/popup/settings.css
@@ -26,7 +26,7 @@ h6 {
 html,
 body,
 .content {
-  /* width: 500px; */
+  min-width: 500px;
   min-height: 450px;
   background-color: #212121;
 }
diff --git a/firefox/popup/settings.html b/firefox/popup/settings.html
index 65c0eb58..aa3b3389 100644
--- a/firefox/popup/settings.html
+++ b/firefox/popup/settings.html
@@ -30,7 +30,7 @@
         <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" alt="Logo">
         <div class="flex-center flex-col">
           <h2 class="title" data-i18n>pageTitle</h2>
-          <p style="font-size: 1em">v.1.1.41</p>
+          <p style="font-size: 1em">v.1.1.42</p>
         </div>
       </div>
       <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none"
@@ -735,7 +735,13 @@ <h2 data-i18n>ImportSettings</h2>
         <h2>Changelog</h2>
         <div>
           <div class="line flex">
-            <h2>1.1.41</h2>
+            <h2>1.1.42</h2>
+            <ul>
+              <li>BUG: Popup not working on edge and chrome</li>
+            </ul>
+          </div>
+          <div class="line flex">
+            <p>1.1.41</p>
             <ul>
               <li>Block Disney Ads</li>
             </ul>
diff --git a/firefox/skipper.js b/firefox/skipper.js
index 51cf8f0e..36244eed 100644
--- a/firefox/skipper.js
+++ b/firefox/skipper.js
@@ -29,7 +29,7 @@ const isMobile = /mobile|streamingEnhanced/i.test(ua);
 const isEdge = /edg/i.test(ua);
 // const isFirefox = /firefox/i.test(ua);
 // const isChrome = /chrome/i.test(ua);
-const version = "1.1.41";
+const version = "1.1.42";
 if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll || isHBO) {
   /* eslint-env root:true */
   // global variables in localStorage
diff --git a/package.json b/package.json
index e2e7383d..c3cbc25d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "streaming-enhanced",
-  "version": "1.1.41",
+  "version": "1.1.42",
   "description": "Automatically skip Ads, Intros, Credits and add Speed Control, etc. on Netflix, Prime video, Disney+ & Hotstar and Crunchyroll.",
   "scripts": {
     "start": "web-ext run",