Merge branch '1' into 2.0

silverstripe · Apr 3, 2023 · 7614c29 · 7614c29
2 parents 48c64d4 + 4e27352
commit 7614c29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 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_sizepressets.js b/client/src/entwine/TinyMCE_ssmedia_sizepressets.js
@@ -30,7 +30,10 @@ function presetButton(editor, preset) {
    * @returns {HTMLElement|undefined}
    */
   const image = () => {
-    const img = editor.selection.getNode();
+    let img = editor.selection.getNode();
+    if (img.tagName !== 'IMG' && img.children.item('img')) {
+      img = img.children.item('img');
+    }
     return img && img.tagName === 'IMG' ? img : undefined;
   };
 
@@ -89,7 +92,9 @@ function presetButton(editor, preset) {
       if (formatMatches()) {
         editor.formatter.apply(formatName);
         const img = image();
-        img.setAttribute('width', width || img.naturalWidth);
+        if (img) {
+          img.setAttribute('width', width || img.naturalWidth);
+        }
       }
     }
   };