Merge branch 'beta-branch'

Ephellon · Feb 14, 2020 · e4d9833 · e4d9833
2 parents 2639c86 + f845476
commit e4d9833
Show file tree

Hide file tree

Showing 33 changed files with 83 additions and 57 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.0",
+	"version": "4.1.2.2",
 	"browser_specific_settings": {
 		"gecko": {
 			"id": "mink.cbos@gmail.com",

diff --git a/moz/options.css b/moz/options.css
@@ -680,9 +680,6 @@ span.checkbox {
 .checkbox[white] input:checked + label:hover {
     background: #fff !important;
 }
-.checkbox[white] input:checked + label {
-    background: #fff !important;
-}
 
 [orange], .checkbox[orange]::before {
     color: #cc7b19 !important;

diff --git a/moz/options.html b/moz/options.html
@@ -531,7 +531,7 @@ <h2>Connection Settings</h2>
 				        <label>Sick Beard API Key</label>
 				        <input type="text" data-option="sickBeardToken" placeholder="What's your Sick Beard API key?" default/>
 				        <div>
-				            1. Go to Sick <strong>Beard</strong> &rarr; <strong>Config</strong> &rarr; <strong>General</strong> &rarr; <strong>API</strong><br/>
+				            1. Go to <strong>Sick Beard</strong> &rarr; <strong>Config</strong> &rarr; <strong>General</strong> &rarr; <strong>API</strong><br/>
 				            &mdash; a. Ensure the checkbox <u>Enable API</u> is checked<br/>
 				            &mdash; b. Press the <u>Generate</u> button<br/>
 				            2. Copy/Paste the <u>API Key</u><br/>

diff --git a/moz/options.js b/moz/options.js
@@ -632,21 +632,23 @@ function getOptionValues() {
 	});
 
 	let COM = options.UseLZW,
-		DEF = options.__defaults == 'true';
+		DEF = options.__defaults == 'true',
+		CHT = $('[data-option="__caught"i]'),
+		THM = $('[data-option="__theme"i]');
 
 	for(let key in __caught)
 		__caught[key] = __caught[key].filter(id => id).slice(0, (COM? 200: 100)).sort();
 
-	// if(options.__theme)
-	// 	__theme = JSON.parse(options.__theme);
+	if(THM.value)
+		__theme = JSON.parse(THM.value);
 	//
 	// __theme = __theme.filter(v => v);
 
 	let _c = JSON.stringify(__caught),
 		_t = JSON.stringify(__theme);
 
-	$('[data-option="__caught"i]').value = options.__caught = (COM? compress(zip(BWT(_c))): _c);
-	$('[data-option="__theme"i]').value = options.__theme = (COM? compress(zip(BWT(_t))): _t);
+	CHT.value = options.__caught = (COM? compress(zip(BWT(_c))): _c);
+	THM.value = options.__theme = (COM? compress(zip(BWT(_t))): _t);
 
 	return options;
 }

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.0",
+	"version": "4.1.2.2",
 
 	"icons": {
 		"16":  "16.png",

diff --git a/opa/options.html b/opa/options.html
@@ -531,7 +531,7 @@ <h2>Connection Settings</h2>
 				        <label>Sick Beard API Key</label>
 				        <input type="text" data-option="sickBeardToken" placeholder="What's your Sick Beard API key?" default/>
 				        <div>
-				            1. Go to Sick <strong>Beard</strong> &rarr; <strong>Config</strong> &rarr; <strong>General</strong> &rarr; <strong>API</strong><br/>
+				            1. Go to <strong>Sick Beard</strong> &rarr; <strong>Config</strong> &rarr; <strong>General</strong> &rarr; <strong>API</strong><br/>
 				            &mdash; a. Ensure the checkbox <u>Enable API</u> is checked<br/>
 				            &mdash; b. Press the <u>Generate</u> button<br/>
 				            2. Copy/Paste the <u>API Key</u><br/>

diff --git a/opa/options.js b/opa/options.js
@@ -637,21 +637,23 @@ function getOptionValues() {
 	});
 
 	let COM = options.UseLZW,
-		DEF = options.__defaults == 'true';
+		DEF = options.__defaults == 'true',
+		CHT = $('[data-option="__caught"i]'),
+		THM = $('[data-option="__theme"i]');
 
 	for(let key in __caught)
 		__caught[key] = __caught[key].filter(id => id).slice(0, (COM? 200: 100)).sort();
 
-	// if(options.__theme)
-	// 	__theme = JSON.parse(options.__theme);
+	if(THM.value)
+		__theme = JSON.parse(THM.value);
 	//
 	// __theme = __theme.filter(v => v);
 
 	let _c = JSON.stringify(__caught),
 		_t = JSON.stringify(__theme);
 
-	$('[data-option="__caught"i]').value = options.__caught = (COM? compress(zip(BWT(_c))): _c);
-	$('[data-option="__theme"i]').value = options.__theme = (COM? compress(zip(BWT(_t))): _t);
+	CHT.value = options.__caught = (COM? compress(zip(BWT(_c))): _c);
+	THM.value = options.__theme = (COM? compress(zip(BWT(_t))): _t);
 
 	return options;
 }

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.0",
+	"version": "4.1.2.2",
 
 	"icons": {
 		"16":  "img/16.png",

diff --git a/src/options/index.css b/src/options/index.css
@@ -680,9 +680,6 @@ span.checkbox {
 .checkbox[white] input:checked + label:hover {
     background: #fff !important;
 }
-.checkbox[white] input:checked + label {
-    background: #fff !important;
-}
 
 [orange], .checkbox[orange]::before {
     color: #cc7b19 !important;

diff --git a/src/options/index.html b/src/options/index.html
@@ -531,7 +531,7 @@ <h2>Connection Settings</h2>
 				        <label>Sick Beard API Key</label>
 				        <input type="text" data-option="sickBeardToken" placeholder="What's your Sick Beard API key?" default/>
 				        <div>
-				            1. Go to Sick <strong>Beard</strong> &rarr; <strong>Config</strong> &rarr; <strong>General</strong> &rarr; <strong>API</strong><br/>
+				            1. Go to <strong>Sick Beard</strong> &rarr; <strong>Config</strong> &rarr; <strong>General</strong> &rarr; <strong>API</strong><br/>
 				            &mdash; a. Ensure the checkbox <u>Enable API</u> is checked<br/>
 				            &mdash; b. Press the <u>Generate</u> button<br/>
 				            2. Copy/Paste the <u>API Key</u><br/>

diff --git a/src/options/index.js b/src/options/index.js
@@ -637,21 +637,23 @@ function getOptionValues() {
 	});
 
 	let COM = options.UseLZW,
-		DEF = options.__defaults == 'true';
+		DEF = options.__defaults == 'true',
+		CHT = $('[data-option="__caught"i]'),
+		THM = $('[data-option="__theme"i]');
 
 	for(let key in __caught)
 		__caught[key] = __caught[key].filter(id => id).slice(0, (COM? 200: 100)).sort();
 
-	// if(options.__theme)
-	// 	__theme = JSON.parse(options.__theme);
+	if(THM.value)
+		__theme = JSON.parse(THM.value);
 	//
 	// __theme = __theme.filter(v => v);
 
 	let _c = JSON.stringify(__caught),
 		_t = JSON.stringify(__theme);
 
-	$('[data-option="__caught"i]').value = options.__caught = (COM? compress(zip(BWT(_c))): _c);
-	$('[data-option="__theme"i]').value = options.__theme = (COM? compress(zip(BWT(_t))): _t);
+	CHT.value = options.__caught = (COM? compress(zip(BWT(_c))): _c);
+	THM.value = options.__theme = (COM? compress(zip(BWT(_t))): _t);
 
 	return options;
 }

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.0",
+	"version": "4.1.2.2",
 
 	"icons": {
 		"16":  "img/16.png",

diff --git a/win/options/index.html b/win/options/index.html
@@ -531,7 +531,7 @@ <h2>Connection Settings</h2>
 				        <label>Sick Beard API Key</label>
 				        <input type="text" data-option="sickBeardToken" placeholder="What's your Sick Beard API key?" default/>
 				        <div>
-				            1. Go to Sick <strong>Beard</strong> &rarr; <strong>Config</strong> &rarr; <strong>General</strong> &rarr; <strong>API</strong><br/>
+				            1. Go to <strong>Sick Beard</strong> &rarr; <strong>Config</strong> &rarr; <strong>General</strong> &rarr; <strong>API</strong><br/>
 				            &mdash; a. Ensure the checkbox <u>Enable API</u> is checked<br/>
 				            &mdash; b. Press the <u>Generate</u> button<br/>
 				            2. Copy/Paste the <u>API Key</u><br/>

diff --git a/win/options/index.js b/win/options/index.js
@@ -637,21 +637,23 @@ function getOptionValues() {
 	});
 
 	let COM = options.UseLZW,
-		DEF = options.__defaults == 'true';
+		DEF = options.__defaults == 'true',
+		CHT = $('[data-option="__caught"i]'),
+		THM = $('[data-option="__theme"i]');
 
 	for(let key in __caught)
 		__caught[key] = __caught[key].filter(id => id).slice(0, (COM? 200: 100)).sort();
 
-	// if(options.__theme)
-	// 	__theme = JSON.parse(options.__theme);
+	if(THM.value)
+		__theme = JSON.parse(THM.value);
 	//
 	// __theme = __theme.filter(v => v);
 
 	let _c = JSON.stringify(__caught),
 		_t = JSON.stringify(__theme);
 
-	$('[data-option="__caught"i]').value = options.__caught = (COM? compress(zip(BWT(_c))): _c);
-	$('[data-option="__theme"i]').value = options.__theme = (COM? compress(zip(BWT(_t))): _t);
+	CHT.value = options.__caught = (COM? compress(zip(BWT(_c))): _c);
+	THM.value = options.__theme = (COM? compress(zip(BWT(_t))): _t);
 
 	return options;
 }

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) {