RTE link

config/current.ver

@@ -1 +1 @@
-1.1.59
+1.1.60

public/assets/js/bridge/rte-editor.js

@@ -944,6 +944,12 @@
                         hideLinkPanel();
                         return;
                     }
+                    restoreSelection();
+                    const range = savedRange ? savedRange.cloneRange() : getSelectionRange();
+                    if (!range || range.collapsed) {
+                        hideLinkPanel();
+                        return;
+                    }
                     try {
                         const linkEl = findLinkAtSelection();
                         if (linkEl && linkEl.setAttribute) {
@@ -952,11 +958,9 @@
                             return;
                         }
                     } catch {}
-                    const range = savedRange ? savedRange.cloneRange() : getSelectionRange();
+                    exec('createLink', url);
-                    if (!range || range.collapsed) {
+                    const linkAfter = findLinkAtSelection();
-                        hideLinkPanel();
+                    if (!linkAfter) {
-                        return;
-                    }
                         try {
                             const docRef = content.ownerDocument || document;
                             const anchor = docRef.createElement('a');
@@ -966,9 +970,7 @@
                             const fragment = range.extractContents();
                             anchor.appendChild(fragment);
                             range.insertNode(anchor);
-                    } catch {
+                        } catch {}
-                        restoreSelection();
-                        exec('createLink', url);
                     }
                     hideLinkPanel();
                 });
@@ -986,6 +988,13 @@
                     } catch {}
                     restoreSelection();
                     exec('unlink');
+                    const stillLinked = findLinkAtSelection();
+                    if (stillLinked && stillLinked.parentNode) {
+                        while (stillLinked.firstChild) {
+                            stillLinked.parentNode.insertBefore(stillLinked.firstChild, stillLinked);
+                        }
+                        stillLinked.parentNode.removeChild(stillLinked);
+                    }
                     hideLinkPanel();
                 });
                 linkCancel.addEventListener('click', hideLinkPanel);