Merge branch 'beta-branch'

SpaceK33z · Feb 14, 2020 · 5cafab9 · 5cafab9
2 parents b1fff48 + 7d711d1
commit 5cafab9
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 27 deletions.
diff --git a/moz.xpi b/moz.xpi
diff --git a/moz.zip b/moz.zip
diff --git a/moz/manifest.json b/moz/manifest.json
@@ -4,7 +4,7 @@
 	"homepage_url": "https://webtoplex.github.io/",
 
 	"manifest_version": 2,
-	"version": "4.1.2.1",
+	"version": "4.1.2.2",
 	"browser_specific_settings": {
 		"gecko": {
 			"id": "[email protected]",

diff --git a/moz/plex.js b/moz/plex.js
@@ -1,5 +1,5 @@
 let script = {
-	"url": "*://app.plex.tv/desktop#!/(server/(?:[a-f\\d]+)|provider/(?:tv.plex.provider.vod))/(details|list)\\?*",
+	"url": "*://app.plex.tv/desktop/?#!/(server/(?:[a-f\\d]+)|provider/(?:tv.plex.provider.vod))/(details|list)\\?*",
 
 	"ready": () => $('.loading').empty,
 

diff --git a/moz/utils.js b/moz/utils.js
@@ -1003,7 +1003,7 @@ var INITIALIZE = INITIALIZE || (async date => {
 			});
 
 			// the message has only 30s to "live"
-			setTimeout(() => Update.messages.splice(0, 1), 30000);
+			setTimeout(() => (Update.messages || []).splice(0, 1), 30000);
 
 			if(postToo)
 				top.postMessage(options);
@@ -2643,10 +2643,15 @@ var INITIALIZE = INITIALIZE || (async date => {
 						onmouseup: event => {
 							let self = event.target, parent = button;
 
-							if(init instanceof Function)
-								button.setAttribute('class', 'closed floating web-to-plex-button restarting'), button.onmouseenter = button.onmouseleave = null, button.querySelector('.list-action').setAttribute('tooltip', 'Restarting...'), setTimeout(() => (init && !RUNNING? (init(), RUNNING = true): RUNNING = false), 500);
-							else
+							if(init instanceof Function) {
+								button.setAttribute('class', 'closed floating web-to-plex-button restarting');
+								button.onmouseenter = button.onmouseleave = null;
+								button.querySelector('.list-action').setAttribute('tooltip', 'Restarting...');
+								INITIALIZE(new Date);
+								init();
+							} else {
 								new Notification('warning', "Couldn't reload. Please refresh the page.");
+							}
 						}
 					},
 					furnish('i[orange][gradient=lighten]', { glyph: 'restart 3x', onmouseup: event => event.target.parentElement.click() }) // <img/>
@@ -3207,6 +3212,7 @@ var INITIALIZE = INITIALIZE || (async date => {
 				UTILS_TERMINAL.LOG('Told to reinitialize...');
 				document.queryBy('.web-to-plex-button').map(e => e.remove());
 				INITIALIZE(new Date);
+				init && init();
 				return true;
 
 			case 'NO_RENDER':

diff --git a/opa.crx b/opa.crx
diff --git a/opa.zip b/opa.zip
diff --git a/opa/manifest.json b/opa/manifest.json
@@ -4,7 +4,7 @@
 	"homepage_url": "https://webtoplex.github.io/",
 
 	"manifest_version": 2,
-	"version": "4.1.2.1",
+	"version": "4.1.2.2",
 
 	"icons": {
 		"16":  "16.png",

diff --git a/opa/plex.js b/opa/plex.js
@@ -1,5 +1,5 @@
 let script = {
-	"url": "*://app.plex.tv/desktop#!/(server/(?:[a-f\\d]+)|provider/(?:tv.plex.provider.vod))/(details|list)\\?*",
+	"url": "*://app.plex.tv/desktop/?#!/(server/(?:[a-f\\d]+)|provider/(?:tv.plex.provider.vod))/(details|list)\\?*",
 
 	"ready": () => $('.loading').empty,
 

diff --git a/opa/plugn.js b/opa/plugn.js
@@ -665,7 +665,7 @@ chrome.runtime.onMessage.addListener(processMessage = async(request = {}, sender
 
 			await fetch(style, { mode: 'cors' })
 				.then(response => response.text())
-				.then(async code => browser.tabs.insertCSS({ code }));
+				.then(async code => chrome.tabs.insertCSS({ code }));
 
 			return true;
 		} catch(error) {

diff --git a/opa/utils.js b/opa/utils.js
@@ -1035,7 +1035,7 @@ let INITIALIZE = (async date => {
 			});
 
 			// the message has only 30s to "live"
-			setTimeout(() => Update.messages.splice(0, 1), 30000);
+			setTimeout(() => (Update.messages || []).splice(0, 1), 30000);
 
 			if(postToo)
 				top.postMessage(options);
@@ -2640,10 +2640,15 @@ let INITIALIZE = (async date => {
 					onmouseup: event => {
 						let self = event.target, parent = button;
 
-						if(init instanceof Function)
-							button.setAttribute('class', 'closed floating web-to-plex-button restarting'), button.onmouseenter = button.onmouseleave = null, button.querySelector('.list-action').setAttribute('tooltip', 'Restarting...'), setTimeout(() => (init && !RUNNING? (init(), RUNNING = true): RUNNING = false), 500);
-						else
+						if(init instanceof Function) {
+							button.setAttribute('class', 'closed floating web-to-plex-button restarting');
+							button.onmouseenter = button.onmouseleave = null;
+							button.querySelector('.list-action').setAttribute('tooltip', 'Restarting...');
+							INITIALIZE(new Date);
+							init();
+						} else {
 							new Notification('warning', "Couldn't reload. Please refresh the page.");
+						}
 					}
 				},
 					furnish('i[orange][gradient=lighten]', { glyph: 'restart 3x', onmouseup: event => event.target.parentElement.click() }) // <img/>
@@ -3238,6 +3243,7 @@ let INITIALIZE = (async date => {
 				UTILS_TERMINAL.LOG('Told to reinitialize...');
 				document.queryBy('.web-to-plex-button').map(e => e.remove());
 				INITIALIZE(new Date);
+				init && init();
 				return true;
 
 			case 'NO_RENDER':

diff --git a/src.crx b/src.crx
diff --git a/src.zip b/src.zip
diff --git a/src/cloud/plex.js b/src/cloud/plex.js
@@ -1,5 +1,5 @@
 let script = {
-	"url": "*://app.plex.tv/desktop#!/(server/(?:[a-f\\d]+)|provider/(?:tv.plex.provider.vod))/(details|list)\\?*",
+	"url": "*://app.plex.tv/desktop/?#!/(server/(?:[a-f\\d]+)|provider/(?:tv.plex.provider.vod))/(details|list)\\?*",
 
 	"ready": () => $('.loading').empty,
 

diff --git a/src/manifest.json b/src/manifest.json
@@ -4,7 +4,7 @@
 	"homepage_url": "https://webtoplex.github.io/",
 
 	"manifest_version": 2,
-	"version": "4.1.2.1",
+	"version": "4.1.2.2",
 
 	"icons": {
 		"16":  "img/16.png",

diff --git a/src/plugn.js b/src/plugn.js
@@ -665,7 +665,7 @@ chrome.runtime.onMessage.addListener(processMessage = async(request = {}, sender
 
 			await fetch(style, { mode: 'cors' })
 				.then(response => response.text())
-				.then(async code => browser.tabs.insertCSS({ code }));
+				.then(async code => chrome.tabs.insertCSS({ code }));
 
 			return true;
 		} catch(error) {

diff --git a/src/utils.js b/src/utils.js
@@ -1035,7 +1035,7 @@ let INITIALIZE = (async date => {
 			});
 
 			// the message has only 30s to "live"
-			setTimeout(() => Update.messages.splice(0, 1), 30000);
+			setTimeout(() => (Update.messages || []).splice(0, 1), 30000);
 
 			if(postToo)
 				top.postMessage(options);
@@ -2640,10 +2640,15 @@ let INITIALIZE = (async date => {
 					onmouseup: event => {
 						let self = event.target, parent = button;
 
-						if(init instanceof Function)
-							button.setAttribute('class', 'closed floating web-to-plex-button restarting'), button.onmouseenter = button.onmouseleave = null, button.querySelector('.list-action').setAttribute('tooltip', 'Restarting...'), setTimeout(() => (init && !RUNNING? (init(), RUNNING = true): RUNNING = false), 500);
-						else
+						if(init instanceof Function) {
+							button.setAttribute('class', 'closed floating web-to-plex-button restarting');
+							button.onmouseenter = button.onmouseleave = null;
+							button.querySelector('.list-action').setAttribute('tooltip', 'Restarting...');
+							INITIALIZE(new Date);
+							init();
+						} else {
 							new Notification('warning', "Couldn't reload. Please refresh the page.");
+						}
 					}
 				},
 					furnish('i[orange][gradient=lighten]', { glyph: 'restart 3x', onmouseup: event => event.target.parentElement.click() }) // <img/>
@@ -3238,6 +3243,7 @@ let INITIALIZE = (async date => {
 				UTILS_TERMINAL.LOG('Told to reinitialize...');
 				document.queryBy('.web-to-plex-button').map(e => e.remove());
 				INITIALIZE(new Date);
+				init && init();
 				return true;
 
 			case 'NO_RENDER':

diff --git a/win.crx b/win.crx
diff --git a/win.zip b/win.zip
diff --git a/win/cloud/plex.js b/win/cloud/plex.js
@@ -1,5 +1,5 @@
 let script = {
-	"url": "*://app.plex.tv/desktop#!/(server/(?:[a-f\\d]+)|provider/(?:tv.plex.provider.vod))/(details|list)\\?*",
+	"url": "*://app.plex.tv/desktop/?#!/(server/(?:[a-f\\d]+)|provider/(?:tv.plex.provider.vod))/(details|list)\\?*",
 
 	"ready": () => $('.loading').empty,
 

diff --git a/win/manifest.json b/win/manifest.json
@@ -4,7 +4,7 @@
 	"homepage_url": "https://webtoplex.github.io/",
 
 	"manifest_version": 2,
-	"version": "4.1.2.1",
+	"version": "4.1.2.2",
 
 	"icons": {
 		"16":  "img/16.png",

diff --git a/win/plugn.js b/win/plugn.js
@@ -665,7 +665,7 @@ chrome.runtime.onMessage.addListener(processMessage = async(request = {}, sender
 
 			await fetch(style, { mode: 'cors' })
 				.then(response => response.text())
-				.then(async code => browser.tabs.insertCSS({ code }));
+				.then(async code => chrome.tabs.insertCSS({ code }));
 
 			return true;
 		} catch(error) {

diff --git a/win/utils.js b/win/utils.js
@@ -1035,7 +1035,7 @@ let INITIALIZE = (async date => {
 			});
 
 			// the message has only 30s to "live"
-			setTimeout(() => Update.messages.splice(0, 1), 30000);
+			setTimeout(() => (Update.messages || []).splice(0, 1), 30000);
 
 			if(postToo)
 				top.postMessage(options);
@@ -2640,10 +2640,15 @@ let INITIALIZE = (async date => {
 					onmouseup: event => {
 						let self = event.target, parent = button;
 
-						if(init instanceof Function)
-							button.setAttribute('class', 'closed floating web-to-plex-button restarting'), button.onmouseenter = button.onmouseleave = null, button.querySelector('.list-action').setAttribute('tooltip', 'Restarting...'), setTimeout(() => (init && !RUNNING? (init(), RUNNING = true): RUNNING = false), 500);
-						else
+						if(init instanceof Function) {
+							button.setAttribute('class', 'closed floating web-to-plex-button restarting');
+							button.onmouseenter = button.onmouseleave = null;
+							button.querySelector('.list-action').setAttribute('tooltip', 'Restarting...');
+							INITIALIZE(new Date);
+							init();
+						} else {
 							new Notification('warning', "Couldn't reload. Please refresh the page.");
+						}
 					}
 				},
 					furnish('i[orange][gradient=lighten]', { glyph: 'restart 3x', onmouseup: event => event.target.parentElement.click() }) // <img/>
@@ -3238,6 +3243,7 @@ let INITIALIZE = (async date => {
 				UTILS_TERMINAL.LOG('Told to reinitialize...');
 				document.queryBy('.web-to-plex-button').map(e => e.remove());
 				INITIALIZE(new Date);
+				init && init();
 				return true;
 
 			case 'NO_RENDER':