Merge remote-tracking branch 'upstream/master'

VERSIONS.md

@@ -1,3 +1,6 @@
+### Version 1.3.1 (13 Feb 2022)
+* Fix security issue (updated jQuery libraries).
+
 ### Version 1.3 (16 Jan 2022)
 * Added "Move Set" buttons for easy reordering of block sets.
 * Added "Add Page" menu (like "Add Site" but includes full path).

common.js

@@ -198,7 +198,8 @@ function getParsedURL(url) {
 // Clean list of sites
 //
 function cleanSites(sites) {
-	sites = sites.replace(/\s+/g, " ").replace(/(^ +)|( +$)|(\w+:\/+)/g, "");
+	sites = sites.replace(/\s+/g, " ").replace(/(^ +)|( +$)/g, ""); // remove extra whitespace
+	sites = sites.replace(/^\w+:\/+/, "").replace(/ \w+:\/+/g, " "); // remove protocols
 	sites = sites.split(" ").sort().join(" "); // sort alphabetically
 	return sites;
 }

manifest.json

@@ -64,6 +64,6 @@
 		"webNavigation"
 	],
 
-	"version": "1.3"
+	"version": "1.3.1"
 
 }

options.html

@@ -95,6 +95,10 @@
 									</select>
 								</div>
 							</p>
+							<p>
+								<input id="countFocus1" type="checkbox">
+								<label for="countFocus1">Count time spent on these sites only when browser tab is active</label>
+							</p>
 							<p>
 								<label>Select when to block these sites:</label>
 								<select id="conjMode1">
@@ -169,10 +173,6 @@
 								<input id="activeBlock1" type="checkbox">
 								<label for="activeBlock1">Immediately block pages on these sites once blocking conditions are met</label>
 							</p>
-							<p>
-								<input id="countFocus1" type="checkbox">
-								<label for="countFocus1">Count time spent on these sites only when browser tab is active</label>
-							</p>
 							<p>
 								<input id="showKeyword1" type="checkbox">
 								<label for="showKeyword1">Show matched keyword on blocking page</label>