Merge branch '2.1' into 2

silverstripe · Sep 17, 2023 · a6c04d3 · a6c04d3
2 parents 4ab0da2 + b77e955
commit a6c04d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/client/dist/js/TinyMCE_ssmedia.js b/client/dist/js/TinyMCE_ssmedia.js
diff --git a/client/src/entwine/TinyMCE_ssmedia.js b/client/src/entwine/TinyMCE_ssmedia.js
@@ -101,7 +101,7 @@ const filter = 'img[data-shortcode="image"]';
       });
 
       editor.on('GetContent', (o) => {
-        const content = jQuery(o.content);
+        const content = jQuery(`<div>${o.content}</div>`);
 
         // Transform [image] shortcodes
         content.find(filter)
@@ -129,13 +129,13 @@ const filter = 'img[data-shortcode="image"]';
             el.replaceWith(shortCode);
           });
 
-        // Insert outerHTML in order to retain all nodes incl. <script>
+        // Insert innerHTML in order to retain all nodes incl. <script>
         // tags which would've been filtered out with jQuery.html().
         // Note that <script> tags might be sanitized separately based on editor config.
         o.content = '';
         content.each(function () {
-          if (this.outerHTML !== undefined) {
-            o.content += this.outerHTML;
+          if (this.innerHTML !== undefined) {
+            o.content += this.innerHTML;
           }
         });
       });