From 1ceca7c293fb49a6e68096974351f58338f3252c Mon Sep 17 00:00:00 2001
From: Tamius Han <zp8324@student.uni-lj.si>
Date: Tue, 6 Feb 2018 00:48:13 +0100
Subject: [PATCH] Debug mode off, updated readme, manifest.json is now written
 for Chrome

---
 README.md        |   7 ++-
 js/conf/Debug.js |   4 +-
 manifest-ff.json | 109 ++++++++++++++++++++++++++++-------------------
 manifest.json    |   4 +-
 4 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index d1ab6ae..e0bcb8f 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,12 @@ Manually triggering aspect ratio change will suspend automatic aspect ratio dete
 
 ## Changelog
 
-### v2.1.0 (FF/AMO, Chrome)
+### v2.1.1 (FF/Amo)
+
+* Fixed issue #20 — aspect ratio autodetection should now start on subsequent videos as well.
+* Netflix sometimes always showed 'no video detected' warning. Popup and background script now periodically poll for `hasVideos` property.
+
+### v2.1.0 (Chrome)
 
 * Popup should work more reliably now
 * Twitch works ... kinda but not always
diff --git a/js/conf/Debug.js b/js/conf/Debug.js
index aa4de47..a93499c 100644
--- a/js/conf/Debug.js
+++ b/js/conf/Debug.js
@@ -1,6 +1,6 @@
 // Set prod to true when releasing
-// _prod = true; 
-_prod = false;
+_prod = true; 
+// _prod = false;
 
 Debug = {
   debug: true,
diff --git a/manifest-ff.json b/manifest-ff.json
index 4ca6b26..ad97773 100644
--- a/manifest-ff.json
+++ b/manifest-ff.json
@@ -1,44 +1,70 @@
 {
   "manifest_version": 2,
   "name": "Ultrawidify",
-  "version": "2.0.3",
+  "version": "2.1.1",
   
   "icons": {
     "32":"res/icons/uw-32.png",
     "64":"res/icons/uw-64.png"
   },
   
-  "description": "Aspect ratio fixer for youtube that works around some people's disability to properly encode 21:9 (and sometimes, 16:9) videos.",
-    
+  "description": "Aspect ratio fixer for youtube that works around some people's disability to properly encode 21:9 (and sometimes, 16:9) videos. Now with more autodetection.",
+  
   "content_scripts": [{
     "matches": ["*://*/*"],
     "js": [ 
-      "js/dep/jquery-3.1.1.js",
-      
-      "js/lib/BrowserDetect.js",
-      "js/lib/StorageManager.js",
-      "js/lib/Comms.js",
-      
-      "js/conf/Debug.js",
-      "js/conf/Settings.js",
-      "js/conf/SitesConf.js",
-      "js/conf/Status.js",
-      "js/conf/ExtensionConf.js",
-      
-      "js/lib/FullScreenDetect.js",
-      
-      "js/modules/PageInfo.js",
-      "js/modules/ArDetect.js", 
-      "js/modules/Resizer.js",
-      
-      "js/conf/Keybinds.js",
-      
-      "js/uw.js" ], 
+    "js/dep/jquery-3.1.1.js",
+    
+    "js/run/GlobalVars.js",
+    "js/lib/BrowserDetect.js",
+    "js/lib/StorageManager.js",
+    "js/lib/Comms.js",
+    
+    "js/conf/Debug.js",
+    "js/conf/Settings.js",
+    "js/conf/SitesConf.js",
+    "js/conf/Status.js",
+    "js/conf/ExtensionConf.js",
+    
+    "js/lib/PlayerDetect.js",
+    
+    "js/modules/PageInfo.js",
+    "js/modules/ArDetect.js", 
+    "js/modules/Resizer.js",
+    
+    "js/conf/Keybinds.js",
+    
+    "js/uw.js" ], 
     "all_frames": true
   }],
   
+  "background": {
+    "scripts": [
+    "js/dep/jquery-3.1.1.js",
+    
+    "js/lib/BrowserDetect.js",
+    "js/lib/StorageManager.js",
+    "js/lib/Comms.js",
+    
+    "js/conf/Debug.js",
+    "js/conf/Settings.js",
+    "js/conf/SitesConf.js",
+    "js/conf/Status.js",
+    "js/conf/ExtensionConf.js",
+    
+    
+    "js/modules/PageInfo.js",
+    "js/modules/ArDetect.js", 
+    "js/modules/Resizer.js",
+    
+    "js/conf/Keybinds.js",
+    
+    "js/uw-bg.js"
+    ]
+  },
+  
   "permissions": [
-    "tabs", "storage",  "activeTab", "<all_urls>", "*://*.youtube.com/*", "*://youtube.com/*", "*://imdb.com/*", "*://*.imdb.com/*"
+    "tabs", "storage",  "activeTab", "<all_urls>", "webNavigation"
   ],
   
   "browser_action": {
@@ -48,25 +74,20 @@
   },
   
   "web_accessible_resources": [
-    "js/*",
+  "js/*",
   
-    "res/img/ytplayer-icons/zoom.png",
-    "res/img/ytplayer-icons/unzoom.png",
-    "res/img/ytplayer-icons/fitw.png",
-    "res/img/ytplayer-icons/fith.png",
-    "res/img/ytplayer-icons/reset.png",
-    "res/img/ytplayer-icons/settings.png",
-    
-    "res/img/settings/about-bg.png",
-    
-    "res/css/uw_common.css",
-    "res/css/uw_yt.css",
-    "res/css/uw_netflix.css",
-    "res/css/uw_settings.css"
-  ],
+  "res/img/ytplayer-icons/zoom.png",
+  "res/img/ytplayer-icons/unzoom.png",
+  "res/img/ytplayer-icons/fitw.png",
+  "res/img/ytplayer-icons/fith.png",
+  "res/img/ytplayer-icons/reset.png",
+  "res/img/ytplayer-icons/settings.png",
   
-  "options_ui" : {
-    "page": "res/settings/settings.html",
-    "open_in_tab": true
-  }
+  "res/img/settings/about-bg.png",
+  
+  "res/css/uw_common.css",
+  "res/css/uw_yt.css",
+  "res/css/uw_netflix.css",
+  "res/css/uw_settings.css"
+  ]
 }
diff --git a/manifest.json b/manifest.json
index ad97773..653d276 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,6 +14,7 @@
     "matches": ["*://*/*"],
     "js": [ 
     "js/dep/jquery-3.1.1.js",
+    "js/dep/chrome/chrome-extension-async.js",
     
     "js/run/GlobalVars.js",
     "js/lib/BrowserDetect.js",
@@ -41,6 +42,7 @@
   "background": {
     "scripts": [
     "js/dep/jquery-3.1.1.js",
+    "js/dep/chrome/chrome-extension-async.js",
     
     "js/lib/BrowserDetect.js",
     "js/lib/StorageManager.js",
@@ -64,7 +66,7 @@
   },
   
   "permissions": [
-    "tabs", "storage",  "activeTab", "<all_urls>", "webNavigation"
+  "tabs", "storage",  "activeTab", "<all_urls>", "webNavigation"
   ],
   
   "browser_action": {