Merge branch 'beta-branch'

Author: Ephellon

moz.xpi

@@ -4,7 +4,7 @@
 	"homepage_url": "https://webtoplex.github.io/",
 
 	"manifest_version": 2,
-	"version": "4.1.2.0",
+	"version": "4.1.2.1",
 	"browser_specific_settings": {
 		"gecko": {
 			"id": "[email protected]",

moz.zip

@@ -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/>

moz/manifest.json

@@ -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;
 }

moz/options.html

@@ -4,7 +4,7 @@
 	"homepage_url": "https://webtoplex.github.io/",
 
 	"manifest_version": 2,
-	"version": "4.1.2.0",
+	"version": "4.1.2.1",
 
 	"icons": {
 		"16":  "16.png",

moz/options.js

@@ -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/>

opa.crx

@@ -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;
 }