Support ?forceBlankTarget

tibiamaps · Jun 3, 2023 · 5c04720 · 5c04720
1 parent 85fcd6b
commit 5c04720
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/_js/map.js b/src/_js/map.js
@@ -1,4 +1,6 @@
 (function() {
+
+	const IS_TIBIAMAPS_IO = location.origin === 'https://tibiamaps.io';
 	function TibiaMap() {
 		this.map = null;
 		this.crosshairs = null;
@@ -195,7 +197,7 @@
 			'flag', 'lock', 'mouth', 'red down', 'red left', 'red right',
 			'red up', 'skull', 'spear', 'star', 'sword', 'up',
 		];
-		const IMAGE_URL_PREFIX = location.origin === 'https://tibiamaps.io' ? '/_img/marker-icons/' : '_img/marker-icons/';
+		const IMAGE_URL_PREFIX = IS_TIBIAMAPS_IO ? '/_img/marker-icons/' : '_img/marker-icons/';
 		symbols.forEach(s => {
 			icons[s] = L.icon({
 				iconSize: [11, 11],
@@ -410,17 +412,26 @@
 	};
 
 	const unembed = function(url) {
-		return url.replace('/embed', '');
+		const updated = url.replace('/embed', '').replace('?forceBlankTarget', '');
+		return updated;
 	};
 
 	const fullscreen = document.querySelector('.leaflet-control-fullscreen-button');
 	// Make the fullscreen ‘button’ act as a permalink in embed views.
 	if (isEmbed) {
 		// Ensure right-click → copy URL works.
 		fullscreen.href = unembed(location.href);
+		const forceBlankTarget = new URLSearchParams(location.search).has('forceBlankTarget');
+		if (forceBlankTarget) {
+			fullscreen.target = '_blank';
+		}
 		// Override the fullscreen behavior.
 		fullscreen.addEventListener('click', function(event) {
-			window.top.location = unembed(location.href);
+			if (forceBlankTarget) {
+				window.open(fullscreen.href, '_blank');
+			} else {
+				window.top.location = fullscreen.href;
+			}
 			event.stopPropagation();
 		});
 	} else {

diff --git a/src/embed.html b/src/embed.html
@@ -11,6 +11,10 @@
 		<link rel="icon" href="favicon.ico">
 	</head>
 	<body>
+		<h1>Embedding the map viewer</h1>
+		<h2>Without <code>forceBlankTarget</code></h2>
 		<iframe src="embed/#32659,32117,7:2"></iframe>
+		<h2>With <code>forceBlankTarget</code></h2>
+		<iframe src="embed/?forceBlankTarget#32659,32117,7:2"></iframe>
 	</body>
 </html>