fix: fixes issue where class is lost when update a link

GetmeUK · Jul 11, 2021 · d3fcb4d · d3fcb4d
1 parent a90b8f6
commit d3fcb4d
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 18 deletions.
diff --git a/build/content-tools.js b/build/content-tools.js
diff --git a/build/content-tools.min.css b/build/content-tools.min.css
diff --git a/build/content-tools.min.js b/build/content-tools.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ContentTools",
   "description": "A JS library for building WYSIWYG editors for HTML content",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "keywords": [
     "wysiwyg",
     "inline",

diff --git a/sandbox/index.html b/sandbox/index.html
@@ -55,7 +55,7 @@ <h1 data-fixture data-name="article-title">
                     </p>
 
                     <p>
-                        The names we devise for folders, files, variables,
+                        The <a href="#test" class="foo" target="_blank">names</a> we devise for folders, files, variables,
                         functions, classes and any other user definable construct
                         will (for the most part) determine how easily someone else
                         can read and understand what we have written.

diff --git a/src/scripts/editor.coffee b/src/scripts/editor.coffee
@@ -402,7 +402,6 @@ class _EditorApp extends ContentTools.ComponentUI
                 content = new HTMLString.String(wrapper.innerHTML)
 
             else
-                console.log wrapper.textContent
                 content = new HTMLString.String(
                     HTMLString.String.encode(wrapper.textContent)
                 )

diff --git a/src/scripts/tools.coffee b/src/scripts/tools.coffee
@@ -358,9 +358,6 @@ class ContentTools.Tools.Link extends ContentTools.Tools.Bold
                 if detail.href
                     element.a = {href: detail.href}
 
-                    if element.a
-                        element.a.class = element.a['class']
-
                     if detail.target
                         element.a.target = detail.target
 
@@ -390,12 +387,36 @@ class ContentTools.Tools.Link extends ContentTools.Tools.Bold
             else
                 # Text elements
 
+                # Attempt to find any existing tag
+                firstATag = null
+                for i in [from...to]
+                    for tag in element.content.characters[i].tags()
+                        if tag.name() == 'a'
+                            firstATag = tag
+                            break
+
+                    if firstATag
+                        break
+
                 # Clear any existing link
                 element.content = element.content.unformat(from, to, 'a')
 
                 # If specified add the new link
                 if detail.href
-                    a = new HTMLString.Tag('a', detail)
+
+                    if firstATag
+                        a = firstATag.copy()
+                    else
+                        a = new HTMLString.Tag('a')
+
+                    a.attr('href', detail.href)
+                    if detail.target
+                        a.attr('target', detail.target)
+                    else
+                        a.removeAttr('target')
+
+                    console.log(a)
+
                     element.content = element.content.format(from, to, a)
                     element.content.optimize()
 
@@ -1439,4 +1460,4 @@ class ContentTools.Tools.Remove extends ContentTools.Tool
         callback(true)
 
         # Dispatch `applied` event
-        @dispatchEditorEvent('tool-applied', toolDetail)
+        @dispatchEditorEvent('tool-applied', toolDetail)