BUG Allow external link anchor fiel to work even if the user provides…

… a hash mark
silverstripe · Feb 23, 2021 · 9a4bf89 · 9a4bf89
1 parent a2b721c
commit 9a4bf89
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/client/dist/js/TinyMCE_sslink.js b/client/dist/js/TinyMCE_sslink.js
diff --git a/client/src/legacy/TinyMCE_sslink.js b/client/src/legacy/TinyMCE_sslink.js
@@ -131,14 +131,24 @@ jQuery.entwine('ss', ($) => {
       return Promise.resolve();
     },
 
-    buildAttributes(data) {
-      const anchor = data.Anchor && data.Anchor.length ? `#${data.Anchor}` : '';
-      const href = `${data.Link}${anchor}`;
+    /**
+     *
+     * @param {string|undefined} Anchor
+     * @param {string} Link
+     * @param {boolean} TargetBlank
+     * @param {string} Description
+     * @returns {{href: string, title: string, target: string}}
+     */
+    buildAttributes({ Anchor, Link, TargetBlank, Description }) {
+      let anchor = Anchor && Anchor.length ? `#${Anchor}` : '';
+      // Make sure, there's no more than one # character at the start of the anchor
+      anchor = anchor.replace(/^#+/, '#');
+      const href = `${Link}${anchor}`;
 
       return {
         href,
-        target: data.TargetBlank ? '_blank' : '',
-        title: data.Description,
+        target: TargetBlank ? '_blank' : '',
+        title: Description,
       };
     },