changed: updated for Elgg 6

.github/workflows/phpunit.yml

@@ -3,6 +3,8 @@ name: PHPUnit Plugin Tests
 on: [push, pull_request]
 
 jobs:
-  lint:
+  phpunit:
     name: Run PHPUnit test suites
     uses: ColdTrick/.github/.github/workflows/phpunit.yml@master
+    with:
+      elgg_major_version: 6

README.md

@@ -1,7 +1,7 @@
 Target Blank
 ============
 
-![Elgg 5.0](https://img.shields.io/badge/Elgg-5.0-green.svg)
+![Elgg 6.0](https://img.shields.io/badge/Elgg-6.0-green.svg)
 ![Lint Checks](https://github.com/ColdTrick/target_blank/actions/workflows/lint.yml/badge.svg?event=push)
 [![Latest Stable Version](https://poser.pugx.org/coldtrick/target_blank/v/stable.svg)](https://packagist.org/packages/coldtrick/target_blank)
 [![License](https://poser.pugx.org/coldtrick/target_blank/license.svg)](https://packagist.org/packages/coldtrick/target_blank)

classes/ColdTrick/TargetBlank/Bootstrap.php

@@ -13,6 +13,6 @@ class Bootstrap extends DefaultPluginBootstrap {
 	 * {@inheritDoc}
 	 */
 	public function init() {
-		elgg_require_js('target_blank/target_blank');
+		elgg_import_esm('target_blank/target_blank');
 	}
 }

classes/ColdTrick/TargetBlank/Javascript.php

@@ -10,7 +10,7 @@ class Javascript {
 	/**
 	 * Add the link suffix to the global JS data
 	 *
-	 * @param \Elgg\Event $event 'elgg.data', 'site'
+	 * @param \Elgg\Event $event 'elgg.data', 'page'
 	 *
 	 * @return array
 	 */

composer.json

@@ -10,6 +10,6 @@
 		"issues": "https://github.com/ColdTrick/target_blank/issues"
 	},
 	"conflict": {
-		"elgg/elgg": "<5.0"
+		"elgg/elgg": "<6.0"
 	}
 }

elgg-plugin.php

@@ -15,7 +15,7 @@
 			],
 		],
 		'elgg.data' => [
-			'site' => [
+			'page' => [
 				'\ColdTrick\TargetBlank\Javascript::setLinkSuffix' => [],
 			],
 		],

views/default/target_blank/target_blank.mjs

@@ -0,0 +1,39 @@
+/**
+ * JS to open links in a new window.
+ */
+import 'jquery';
+import 'elgg';
+
+var site_url = elgg.get_site_url().substring(4);
+if (site_url.substring(0, 1) === 's') {
+	site_url = site_url.substring(1);
+}
+
+var selector = 'a[href^="http://"]:not([target], [href^="http' + site_url + '"], [href^="https' + site_url + '"]),';
+selector += 'a[href^="https://"]:not([target], [href^="http' + site_url + '"], [href^="https' + site_url + '"])';
+
+$(document).on('click', selector, function () {
+	$(this).attr('target', '_blank');
+}).addClass('target-blank');
+
+
+var suffix = null;
+if (elgg.data.target_blank !== undefined && elgg.data.target_blank.link_suffix !== undefined) {
+	suffix = elgg.data.target_blank.link_suffix;
+}
+
+if (suffix) {
+	$(selector).each(function() {
+		if ($(this).find(' > img, > .elgg-anchor-label > img').length) {
+			// there is an image in the link
+			return;
+		}
+
+		if (!$(this).html().length) {
+			// there is no content in the anchor
+			return;
+		}
+
+		$(this).append('<span class="target-blank-suffix">' + suffix + '</span>');
+	});
+}