Merge pull request #62 from Jackymancs4-Fork/master

Add native notification, options page and minor app refactoring.
timbru31 · Jan 13, 2019 · 257f27a · 257f27a
2 parents 12fcde6 + bb8ceb1
commit 257f27a
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 91 deletions.
diff --git a/src/css/style.css b/src/css/style.css
diff --git a/src/js/background.ts b/src/js/background.ts
@@ -1,7 +1,7 @@
 // tslint:disable-next-line:variable-name
 const _browser = chrome || browser;
-
 let tags: string[] = [];
+let amazonTagRemoverNotification: string = 'amazon-tag-remover-notification';
 const amazonURLs = [
 	'*://*.amazon.at/*',
 	'*://*.amazon.ca/*',
@@ -28,11 +28,19 @@ _browser.webRequest.onBeforeRequest.addListener(
 	},
 	['blocking']
 );
-
 _browser.webNavigation.onCompleted.addListener(
 	() => {
 		if (tags && tags.length) {
-			renderBox();
+			const enableNotifications = _browser.storage.local.get('enableNotifications', (item: any) => {
+				if (item.enableNotifications) {
+					_browser.notifications.create(amazonTagRemoverNotification, {
+						iconUrl: _browser.extension.getURL('images/icon64.png'),
+						message: `The following tags were found and have been removed: ${tags}`,
+						title: 'Amazon Tag Remover',
+						type: 'basic'
+					});
+				}
+			});
 		}
 	},
 	{
@@ -48,9 +56,7 @@ function interceptRequest(request: chrome.webRequest.WebRequestBodyDetails) {
 	if (request && request.url) {
 		const sanitizedResult = sanitizeURL(request.url);
 		if (sanitizedResult.match) {
-			return {
-				redirectUrl: sanitizedResult.url
-			};
+			return { redirectUrl: sanitizedResult.url };
 		}
 	}
 }
@@ -69,32 +75,5 @@ function sanitizeURL(urlString: string) {
 	}
 	searchParams.delete('tag');
 	searchParams.delete('ascsubtag');
-	return {
-		match,
-		url: url.toString()
-	};
-}
-
-function renderBox() {
-	_browser.tabs.query(
-		{
-			active: true,
-			currentWindow: true
-		},
-		tabs => {
-			_browser.tabs.sendMessage(
-				tabs[0].id!,
-				{
-					tags
-				},
-				() => {
-					tags = [];
-				}
-			);
-		}
-	);
-
-	_browser.tabs.insertCSS({
-		file: 'css/style.css'
-	});
+	return { match, url: url.toString() };
 }
diff --git a/src/js/frontend.ts b/src/js/frontend.ts
diff --git a/src/js/options.ts b/src/js/options.ts
@@ -0,0 +1,20 @@
+// tslint:disable-next-line:variable-name
+const __browser = chrome || browser;
+
+function saveOptions(e: Event) {
+	e.preventDefault();
+	__browser.storage.local.set({
+		enableNotifications: document.querySelector<HTMLInputElement>('#enable-notifications')!.checked
+	});
+}
+
+function restoreOptions() {
+	function setCurrentChoice(result: any) {
+		document.querySelector<HTMLInputElement>('#enable-notifications')!.checked = result.enableNotifications;
+	}
+
+	__browser.storage.local.get('enableNotifications', setCurrentChoice);
+}
+
+document.addEventListener('DOMContentLoaded', restoreOptions);
+document.querySelector('form')!.addEventListener('submit', saveOptions);
diff --git a/src/manifest.json b/src/manifest.json
@@ -27,16 +27,20 @@
 				"*://*.amazon.in/*",
 				"*://*.amazon.it/*",
 				"*://*.amazon.nl/*"
-			],
-			"js": ["js/frontend.js"]
+			]
 		}
 	],
+	"options_ui": {
+		"page": "options.html"
+	},
 	"permissions": [
 		"tabs",
 		"activeTab",
 		"webNavigation",
 		"webRequest",
 		"webRequestBlocking",
+		"notifications",
+		"storage",
 		"*://*.amazon.at/*",
 		"*://*.amazon.ca/*",
 		"*://*.amazon.cn/*",

diff --git a/src/options.html b/src/options.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="utf-8">
+</head>
+
+<body>
+	<form>
+		<label>Show notifications: <input type="checkbox" id="enable-notifications" checked></label>
+		<br>
+		<br>
+		<button type="submit">Save</button>
+	</form>
+	<script src="js/options.js"></script>
+</body>
+
+</html>