change defaults

src/bg.js

@@ -7,7 +7,7 @@ var changeIcon = function(color, currentIcon, options) {
 	var ctx = canvas.getContext('2d');
 	var img = new Image();
 
-	if (currentIcon && typeof(currentIcon) !== 'undefined' && currentIcon !== null && currentIcon !== 'undefined') {
+	if (currentIcon && typeof(currentIcon) !== 'undefined' && currentIcon !== null && currentIcon !== "null" && currentIcon !== 'undefined') {
 		img.src = currentIcon;
 	} else {
 		img.src = 'data:image/x-icon;base64,AAABAAEAEBACAAEAAQCwAAAAFgAAACgAAAAQAAAAIAAAAAEAAQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA';
@@ -39,14 +39,13 @@ var changeIcon = function(color, currentIcon, options) {
 };
 
 var generateRandomColor = function(seed) {
-	var selectColor = function (colorNum, colors) {
-		if (colors < 1) {
-			colors = 1; // defaults to one color - avoid divide by zero
-		}
-		return "hsl(" + (colorNum * (360 / colors) % 360) + ",100%,50%)";
+	var colors = ['#e6194b', '#3cb44b', '#ffe119', '#0082c8', '#f58231', '#FFFFFF'];
+
+	var selectColor = function (colorNum) {
+		return colors[seed % colors.length]
 	}
 
-	return selectColor(seed, 8);
+	return selectColor(seed);
 };
 
 var registerToTST = async function() {
@@ -115,7 +114,7 @@ var updateAllColorsOnAllTabs = async () => {
 					if (tabHost) {
 						tabHost = tabHost.toLowerCase();
 					}
-					if (!(options.ignore && options.ignore.split('\n').includes(tabHost))) {
+					if (!(options.globals.ignore && options.globals.ignore.split('\n').includes(tabHost))) {
 						browser.tabs.executeScript(tabs[i].id, {
 							code: '(' + changeIcon.toString() + ')' +
 								'("' + generateRandomColor(t.parentIndex) + '", "' + t.faviconUrl + '", ' + JSON.stringify(options) + ')'

src/manifest.json

@@ -2,7 +2,7 @@
   "description": "Color tabs based on their parent.",
   "manifest_version": 2,
   "name": "Color Tab Group",
-  "version": "0.0.9",
+  "version": "0.0.14",
   "homepage_url": "https://git.e.tern.al/s2/tab-groupcolor",
   "icons": {
     "48": "img/icon-48.png"

src/options/options.js

@@ -16,6 +16,7 @@ document.addEventListener('DOMContentLoaded', () => {
 	loadOptions().then((options) => {
 		document.querySelector('#indicator-width').value = options.globals.width;
 		document.querySelector('#indicator-orientation').value = options.globals.orientation;
+		document.querySelector('#ignore').value = options.globals.ignore;
 	});
 });
 

src/utils.js

@@ -1,8 +1,9 @@
 function loadOptions() {
 	return browser.storage.local.get({
 		globals: {
-			width: 3,
-			orientation: 'vertical'
+			width: 5,
+			orientation: 'horizontal',
+			ignore: 'web.whatsapp.com'
 		}
 	});
 }