fix external link aria-label getting replaced.

digitoimistodude · Sep 7, 2023 · 0580cf2 · 0580cf2
1 parent e6e0df8
commit 0580cf2
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 333 deletions.
diff --git a/js/dev/front-end.js b/js/dev/front-end.js
diff --git a/js/dev/gutenberg-editor.js b/js/dev/gutenberg-editor.js
@@ -15,7 +15,7 @@
   \************************************/
 /***/ (() => {
 
-eval("/**\n * @Author: Roni Laukkarinen\n * @Date:   2022-02-11 15:38:14\n * @Last Modified by:   Roni Laukkarinen\n * @Last Modified time: 2022-09-29 13:53:14\n */\n// Declare the blocks you'd like to style.\n// eslint-disable-next-line\nwp.blocks.registerBlockStyle('core/paragraph', {\n  name: 'boxed',\n  label: 'Laatikko'\n});\n\n// When document is ready as in when blocks are fully loaded\nwindow.addEventListener('load', function () {\n  /**\n   * initializeBlock\n   *\n   * Adds custom JavaScript to the block HTML.\n   *\n   * @date    15/4/19\n   * @since   1.0.0\n   *\n   * @param   object $block The block jQuery element.\n   * @param   object attributes The block attributes (only available when editing).\n   * @return  void\n   *\n   * @source https://www.advancedcustomfields.com/resources/acf_register_block_type/\n   */\n  // eslint-disable-next-line\n  var initializeBlock = function initializeBlock($block) {\n    // Your scripts here\n  };\n\n  // Initialize dynamic block preview (editor).\n  if (window.acf) {\n    window.acf.addAction('render_block_preview', initializeBlock);\n  }\n});\n\n//# sourceURL=webpack://air-light/./js/src/gutenberg-editor.js?");
+eval("/**\n * @Author: Roni Laukkarinen\n * @Date:   2022-02-11 15:38:14\n * @Last Modified by:   Roni Laukkarinen\n * @Last Modified time: 2022-09-29 13:53:14\n */\n// Declare the blocks you'd like to style.\n// eslint-disable-next-line\nwp.blocks.registerBlockStyle('core/paragraph', {\n  name: 'boxed',\n  label: 'Laatikko'\n}); // When document is ready as in when blocks are fully loaded\n\nwindow.addEventListener('load', function () {\n  /**\n   * initializeBlock\n   *\n   * Adds custom JavaScript to the block HTML.\n   *\n   * @date    15/4/19\n   * @since   1.0.0\n   *\n   * @param   object $block The block jQuery element.\n   * @param   object attributes The block attributes (only available when editing).\n   * @return  void\n   *\n   * @source https://www.advancedcustomfields.com/resources/acf_register_block_type/\n   */\n  // eslint-disable-next-line\n  var initializeBlock = function initializeBlock($block) {// Your scripts here\n  }; // Initialize dynamic block preview (editor).\n\n\n  if (window.acf) {\n    window.acf.addAction('render_block_preview', initializeBlock);\n  }\n});\n\n//# sourceURL=webpack://air-light/./js/src/gutenberg-editor.js?");
 
 /***/ })
 

diff --git a/js/dev/legacy.js b/js/dev/legacy.js
diff --git a/js/prod/front-end.js b/js/prod/front-end.js
diff --git a/js/prod/legacy.js b/js/prod/legacy.js
diff --git a/js/src/modules/external-link.js b/js/src/modules/external-link.js
@@ -2,8 +2,8 @@
 /**
  * @Author: Roni Laukkarinen
  * @Date:   2021-09-01 11:55:37
- * @Last Modified by:   Roni Laukkarinen
- * @Last Modified time: 2022-10-31 16:23:45
+ * @Last Modified by:   Elias Kautto
+ * @Last Modified time: 2023-09-07 12:13:08
  */
 /**
  * Style external links
@@ -101,8 +101,10 @@ export function styleExternalLinks() {
     if (!externalLink.classList.contains('no-external-link-label')) {
       const textContent = externalLink.textContent.trim().length
         ? externalLink.textContent.trim() : getChildAltText(externalLink);
-      const ariaLabel = externalLink.target === '_blank' ? `${textContent}: ${getLocalization('external_link')}, ${getLocalization('target_blank')}` : `${textContent}: ${getLocalization('external_link')}`;
-      externalLink.setAttribute('aria-label', ariaLabel);
+      if (textContent && !externalLink.getAttribute('aria-label')) {
+        const ariaLabel = externalLink.target === '_blank' ? `${textContent}: ${getLocalization('external_link')}, ${getLocalization('target_blank')}` : `${textContent}: ${getLocalization('external_link')}`;
+        externalLink.setAttribute('aria-label', ariaLabel);
+      }
     }
 
     // Arrow icon won't be added if one of these classes is defined for the link