0.5.1.0

Made changes.
SpaceK33z · May 19, 2018 · e860992 · e860992
1 parent 8bdc6db
commit e860992
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 68 deletions.
diff --git a/src/background.js b/src/background.js
@@ -21,9 +21,9 @@ function viewCouchPotato(request, sendResponse) {
 		headers: generateHeaders(request.basicAuth),
 	})
 		.then(response => response.json())
-		.then(response => {
-			let success = response.success;
-			sendResponse({ success, status: success ? response.media.status : null });
+		.then(json => {
+			let success = json.success;
+			sendResponse({ success, status: success ? json.media.status : null });
 		})
 		.catch(error => {
 			sendResponse({ error: String(error), location: 'view CouchPotato' });

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,79 +1,86 @@
 {
-"update_url": "https://clients2.google.com/service/update2/crx",
+    "update_url": "https://clients2.google.com/service/update2/crx",
 
 	"name": "Web to Plex+",
 	"description": "Adds a button on various movie & TV show sites to open it in Plex.",
     "homepage_url": "https://github.com/Ephellon/web-to-plex/",
+
 	"manifest_version": 2,
-    "version": "0.5.0.0",
+    "version": "0.5.1.0",
+// Firefox Support =>
+//    "applications": {
+//        "gecko": {
+//            "id": "minkcbos@gmail.com",
+//            "strict_min_version": "57.0"
+//        }
+//    },
+
 	"icons": {
 		"16": "img/16.png",
 		"48": "img/48.png",
 		"128": "img/128.png",
         "256": "img/256.png"
 	},
+
 	"content_scripts": [
 		{
-			"matches": ["https://*.movieo.me/*"],
+			"matches": ["*://*.movieo.me/*"],
 			"js": ["history-hack.js", "utils.js", "movieo.js"],
 			"css": ["movieo.css"]
-		},
-		{
+		},{
 			"matches": ["*://*.imdb.com/*"],
 			"js": ["utils.js", "imdb.js"],
 			"css": ["imdb.css"]
-		},
-		{
-			"matches": ["https://*.trakt.tv/*"],
+		},{
+			"matches": ["*://*.trakt.tv/*"],
 			"js": ["history-hack.js", "utils.js", "trakt.js"],
 			"css": ["trakt.css"]
-		},
-		{
-			"matches": ["https://*.letterboxd.com/film/*"],
+		},{
+			"matches": ["*://*.letterboxd.com/film/*"],
 			"js": ["utils.js", "letterboxd.js"],
 			"css": ["letterboxd.css"]
-		},
-		{
-			"matches": ["https://*.flenix.co/movies/*"],
+		},{
+			"matches": ["*://*.flenix.co/movies/*", "*://*.flenix.cc/movies/*", "*://*.flenix.net/movies/*"],
 			"js": ["utils.js", "flenix.js"],
 			"css": ["flenix.css"]
-		},
-		{
-			"matches": ["https://*.tvmaze.com/shows/*"],
+		},{
+			"matches": ["*://*.tvmaze.com/shows/*"],
 			"js": ["utils.js", "tvmaze.js"],
 			"css": ["tvmaze.css"]
-		},
-		{
-			"matches": ["https://*.thetvdb.com/series/*"],
+		},{
+			"matches": ["*://*.thetvdb.com/series/*"],
 			"js": ["utils.js", "thetvdb.js"],
 			"css": ["thetvdb.css"]
-		},
-		{
-			"matches": ["https://*.themoviedb.org/movie/*", "https://*.themoviedb.org/tv/*"],
+		},{
+			"matches": ["*://*.themoviedb.org/movie/*", "https://*.themoviedb.org/tv/*"],
 			"js": ["utils.js", "themoviedb.js"],
 			"css": ["themoviedb.css"]
-		},
-		{
-			"matches": ["https://*.vrv.co/series/*"],
+		},{
+			"matches": ["*://*.vrv.co/series/*"],
 			"js": ["utils.js", "vrv.js"],
 			"css": ["vrv.css"]
-		},
-		{
-			"matches": ["https://*.hulu.com/*"],
+		},{
+			"matches": ["*://*.hulu.com/*"],
 			"js": ["utils.js", "hulu.js"],
 			"css": ["hulu.css"]
-		},
-		{
-			"matches": ["https://*.google.com/store/*"],
+		},{
+			"matches": ["*://*.google.com/store/*"],
 			"js": ["utils.js", "google.js"],
 			"css": ["google.css"]
 		}
 	],
+
 	"background": {
 		"scripts": ["background.js"],
 		"persistent": false
 	},
+
 	"options_page": "options/index.html",
+    "options_ui": {
+        "page": "options/index.html",
+        "open_in_tab": true
+    },
+
     "browser_action": {
         "default_icon": {
             "16": "img/16.png",
@@ -82,6 +89,7 @@
         "default_title": "Web to Plex+",
         "default_popup": "popup/index.html"
     },
+
 	"permissions": [
         "tabs",
 		"storage",

diff --git a/src/options/index.html b/src/options/index.html
@@ -8,7 +8,7 @@
         }
 
 		body {
-            background: url(../img/noise.png), url(../img/256.png) no-repeat fixed center, #3f4245 !important;
+            background: url(../img/noise.png) fixed, url(../img/256.png) no-repeat fixed center, #3f4245 !important;
 			color: #333 !important;
             font-family: Open Sans Regular, Helvetica Neue, Helvetica, Arial, sans-serif, system;
             font-size: 18px !important;
@@ -168,24 +168,24 @@
 
 <body>
     <h1>Plex Settings</h1>
-	<section>
-		<label>Login using your Plex token</label>
-		<input type="text" id="plex_token" data-option="plexToken" placeholder="Enter your Plex token"/>
-        <div>
-            How to find your <a href="https://support.plex.tv/hc/en-us/articles/204059436-Finding-your-account-token-X-Plex-Token" title="How to find your token?" target="_blank">Plex Token</a>.
-        </div>
-    </section>
-
-    <h3><em>OR</em></h3>
-
     <section>
         <label>Login using your Plex credentials</label>
         <input type="text" id="plex_username" style="border-bottom-left-radius: 0 !important; border-bottom-right-radius: 0 !important;" placeholder="Enter your Plex username"/>
         <input type="text" id="plex_password" style="border-top-left-radius: 0 !important; border-top-right-radius: 0 !important;" placeholder="Enter your Plex password"/>
 		<div>
-            <em>Your username and password are never sotred, only your <a href="https://support.plex.tv/hc/en-us/articles/204059436-Finding-your-account-token-X-Plex-Token" title="How to find your token?" target="_blank">Plex Token</a>.</em>
+            <em>Your Plex username and password are never stored, only your <a href="https://support.plex.tv/hc/en-us/articles/204059436-Finding-your-account-token-X-Plex-Token" title="How to find your token?" target="_blank">Plex Token</a>.</em>
         </div>
 	</section>
+
+    <h3 style="width: 35%; text-align: center;"><em>&mdash; OR &mdash;</em></h3>
+
+	<section>
+		<label>Login using your Plex token</label>
+		<input type="text" id="plex_token" data-option="plexToken" placeholder="Enter your Plex token"/>
+        <div>
+            How to find your <a href="https://support.plex.tv/hc/en-us/articles/204059436-Finding-your-account-token-X-Plex-Token" title="How to find your token?" target="_blank">Plex Token</a>.
+        </div>
+    </section>
 	<section>
 		<button type="button" id="plex_test" style="background: #cc7b19 !important;">Test</button>
 		<div id="plex_test_status"></div>
@@ -222,7 +222,7 @@ <h2>Connection Settings</h2>
                 </div>
             </section>
 
-            <h3>Login Settings <em>(optional)</em></h3>
+            <h3>Login Settings <em>(optional, saved)</em></h3>
             <section>
                 <label>username</label>
                 <input type="text" data-option="couchpotatoBasicAuthUsername" placeholder="Enter your CouchPotato username"/>
@@ -277,7 +277,7 @@ <h2>Connection Settings</h2>
                 </div>
             </section>
 
-            <h3>Login Settings <em>(optional)</em></h3>
+            <h3>Login Settings <em>(optional, saved)</em></h3>
             <section>
                 <label>username</label>
                 <input type="text" data-option="radarrBasicAuthUsername" placeholder="Enter your Radarr username"/>
@@ -332,7 +332,7 @@ <h2>Connection Settings</h2>
                 </div>
             </section>
 
-            <h3>Login Settings <em>(optional)</em></h3>
+            <h3>Login Settings <em>(optional, saved)</em></h3>
             <section>
                 <label>username</label>
                 <input type="text" data-option="sonarrBasicAuthUsername" placeholder="Enter your Sonarr username"/>
@@ -357,6 +357,8 @@ <h3>Login Settings <em>(optional)</em></h3>
         </details>
     </article>
 
+    <br>
+
 	<section>
 		<button id="save" style="background: #cc7b19">Save</button>
         <span id="status"></span>

diff --git a/src/popup/index.html b/src/popup/index.html
@@ -13,29 +13,29 @@
             background: url(../img/noise.png), #3f4245 !important;
 			color: #333 !important;
             font-family: Open Sans Regular, Helvetica Neue, Helvetica, Arial, sans-serif, system;
-            font-size: 18px !important;
-            flex-grow: 1;
-            padding: 1px;
-            overflow: hidden;
-            position: absolute;
+            font-size: 1.25em !important;
+            flex-grow: 1 !important;
+            padding: 1px !important;
+            overflow: hidden !important;
+            position: absolute !important;
 		}
 
         a {
             text-decoration: none !important;
             cursor: pointer !important;
-            margin: 0;
+            margin: 0 !important;
         }
 
         img {
-            vertical-align: middle;
-            padding: 0 21px !important;
+            vertical-align: middle !important;
+            padding: 0 1em !important;
         }
 
         label {
             color: #eee !important;
             cursor: inherit !important;
             font-weight: 400 !important;
-            display: inline-block;
+            display: inline-block !important;
             margin-bottom: 5px;
             display: block !important;
             position: relative !important;
@@ -46,20 +46,19 @@
         }
 
         table {
-            height: 100%;
-            width: 100%;
+            height: 100% !important;
+            width: 100% !important;
             font-size: 1em !important;
-            position: relative;
             overflow: auto !important;
             color: #fff !important;
             font-weight: 400 !important;
-            padding-bottom: 1em;
+            padding-bottom: 1em !important;
         }
 
         tr {
             box-shadow: none !important;
-            height: 200px;
-            width: 600px;
+            height: calc(33% - 25px);
+            width: calc(100% - 25px);
         }
 
         td {
@@ -74,8 +73,8 @@
             vertical-align: middle;
             white-space: nowrap;
             user-select: none;
-            height: 170px;
-            width: 170px;
+            height: calc(100% - 30px);
+            width: calc(100% - 30px);
             transition: box-shadow 0.5s !important;
         }
 
@@ -133,7 +132,7 @@
             float: right;
             width: 3em;
             height: 3em;
-            margin-top: -9.5em;
+            margin-top: -8.5em;
             margin-right: -1em;
         }