Started upgrade to TinyMCE6, Untested

[bookstack] / resources / js / wysiwyg / plugins-details.js

diff --git a/resources/js/wysiwyg/plugins-details.js b/resources/js/wysiwyg/plugins-details.js
index 9b5287947c406d026b7ce2bc21c69eaa589f45e0..d787373c75840e675ed5491a7a2f401969bcb5a9 100644 (file)
--- a/resources/js/wysiwyg/plugins-details.js
+++ b/resources/js/wysiwyg/plugins-details.js
@@ -64,8 +64,8 @@ function register(editor, url) {
         editor.insertContent(details.outerHTML);
         editor.focus();
 
-        const domDetails = editor.dom.$(`[data-id="${id}"]`);
-        if (domDetails) {
+        const domDetails = editor.dom.select(`[data-id="${id}"]`);
+        if (!domDetails.length) {
             const firstChild = domDetails.find('doc-root > *');
             if (firstChild) {
                 firstChild[0].focus();
@@ -169,6 +169,7 @@ function setSummary(editor, summaryContent) {
  */
 function unwrapDetailsInSelection(editor) {
     const details = editor.selection.getNode().closest('details');
+    const selectionBm = editor.selection.getBookmark();
 
     if (details) {
         const elements = details.querySelectorAll('details > *:not(summary, doc-root), doc-root > *');
@@ -180,7 +181,9 @@ function unwrapDetailsInSelection(editor) {
             details.remove();
         });
     }
+
     editor.focus();
+    editor.selection.moveToBookmark(selectionBm);
 }
 
 /**