Replace window.open with browser.tabs.create

Fixes #661

browserAction/browserAction.js

@@ -69,7 +69,7 @@
 					browser.runtime.openOptionsPage();
 				}
 				else {
-					window.open(extension.getURL("options/options.html"), "_blank");
+					browser.tabs.create({url: extension.getURL("options/options.html")});
 				}
 				window.close();
 			}
@@ -78,7 +78,7 @@
 			label: "faq",
 			icon: extension.getURL("icons/browserAction-faq.svg"),
 			action: function(){
-				window.open("https://canvasblocker.kkapsner.de/faq/", "_blank");
+				browser.tabs.create({url: "https://canvasblocker.kkapsner.de/faq/"});
 				window.close();
 			}
 		},
@@ -87,7 +87,7 @@
 			advanced: true,
 			icon: extension.getURL("icons/browserAction-test.svg"),
 			action: function(){
-				window.open("https://canvasblocker.kkapsner.de/test", "_blank");
+				browser.tabs.create({url: "https://canvasblocker.kkapsner.de/test"});
 				window.close();
 			}
 		},
@@ -95,7 +95,7 @@
 			label: "review",
 			icon: extension.getURL("icons/browserAction-review.svg"),
 			action: function(){
-				window.open("https://addons.mozilla.org/firefox/addon/canvasblocker/reviews/", "_blank");
+				browser.tabs.create({url: "https://addons.mozilla.org/firefox/addon/canvasblocker/reviews/"});
 				window.close();
 			}
 		},
@@ -103,7 +103,7 @@
 			label: "reportIssue",
 			icon: extension.getURL("icons/browserAction-reportIssue.svg"),
 			action: function(){
-				window.open("https://github.com/kkapsner/CanvasBlocker/issues", "_blank");
+				browser.tabs.create({url: "https://github.com/kkapsner/CanvasBlocker/issues"});
 				window.close();
 			}
 		},
@@ -149,11 +149,11 @@
 		
 		search.addEventListener("keypress", function(event){
 			if ([10, 13].indexOf(event.keyCode) !== -1){
-				window.open(extension.getURL(
+				browser.tabs.create({url: extension.getURL(
 					"options/options.html" +
 					"?search=" +
 					encodeURIComponent(this.value)
-				));
+				)});
 				window.close();
 			}
 		});

options/options.js

@@ -25,11 +25,11 @@
 		},
 		openNavigatorSettings: function(){
 			logging.verbose("open navigator settings");
-			window.open("navigator.html", "_blank");
+			browser.tabs.create({url: "navigator.html"});
 		},
 		showReleaseNotes: function(){
 			logging.verbose("open release notes");
-			window.open("../releaseNotes.txt", "_blank");
+			browser.tabs.create({url: extension.getURL("../releaseNotes.txt")});
 		},
 		clearPersistentRnd: function(){
 			logging.message("clear persistent rnd storage");
@@ -53,15 +53,15 @@
 		},
 		inspectSettings: function(){
 			logging.verbose("open settings inspection");
-			window.open("export.html", "_blank");
+			browser.tabs.create({url: "export.html"});
 		},
 		openSettingSanitation: function(){
 			logging.verbose("open settings sanitation");
-			window.open("sanitize.html", "_blank");
+			browser.tabs.create({url: "sanitize.html"});
 		},
 		openSettingPresets: function(){
 			logging.verbose("open setting presets");
-			window.open("presets.html", "_blank");
+			browser.tabs.create({url: "presets.html"});
 		},
 		saveSettings: function(){
 			logging.verbose("save settings");
@@ -92,7 +92,7 @@
 		},
 		inspectWhitelist: function(){
 			logging.verbose("open whitelist inspection");
-			window.open("whitelist.html", "_blank");
+			browser.tabs.create({url: "whitelist.html"});
 		},
 		loadSettings: async function(){
 			logging.verbose("load settings");

pageAction/pageAction.js

@@ -30,7 +30,7 @@
 							browser.runtime.openOptionsPage();
 						}
 						else {
-							window.open(extension.getURL("options/options.html"), "_blank");
+							browser.tabs.create({url: extension.getURL("options/options.html")});
 						}
 					}
 				},
@@ -152,15 +152,12 @@
 			name: "inspectWhitelist",
 			isIcon: true,
 			callback: function({domain, urls}){
-				window.open(
+				browser.tabs.create({url: extension.getURL(
-					extension.getURL(
+					"options/whitelist.html?domain=" +
-						"options/whitelist.html?domain=" +
+					encodeURIComponent(domain) +
-						encodeURIComponent(domain) +
+					"&urls=" +
-						"&urls=" +
+					encodeURIComponent(JSON.stringify(Array.from(urls.values())))
-						encodeURIComponent(JSON.stringify(Array.from(urls.values())))
+				)});
-					),
-					"_blank"
-				);
 			}
 		}
 	];

releaseNotes.txt

@@ -10,6 +10,7 @@ Version 1.10:
 		- persistent rng not working in Firefox for Android
 		- mobile default settings were not used in Firefox for Android
 		- settings export page did not show whole content in Firefox for Android
+		- new tabs opened from within the extension did not open properly in Firefox for Android
 	
 	known issues:
 		- if a data URL is blocked the page action button does not appear

versions/updates.json

@@ -253,6 +253,14 @@
 				{
 					"version": "1.10Alpha20230419",
 					"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.10Alpha20230419.xpi"
+				},
+				{
+					"version": "1.10Alpha20230529",
+					"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.10Alpha20230529.xpi"
+				},
+				{
+					"version": "1.10Alpha20230530",
+					"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.10Alpha20230530.xpi"
 				}
 			]
 		}