Merge pull request #53 from mendix/bugfix/ticket49079

Possible bugfix image dimensions

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CKEditorForMendix",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "A new WYSIWYG editor for Mendix that also has the ability to create MicroFlow links in your HTML output.",
   "license": "Apache License, Version 2",
   "author": "Mendix",

src/CKEditorForMendix/CKEditorForMendix.xml

@@ -324,6 +324,11 @@
             <category>Images</category>
             <description>This constraint might be used to filter the set of browsable images. (not functional right now)</description>
         </property>
+        <property key="useImageStyleProperty" type="boolean" defaultValue="true">
+            <caption>Use image style size</caption>
+            <category>Images</category>
+            <description>This will use the normal 'style' property on an image to set the dimensions. If you set this false, it will set the width and height as a normal html property. This is sometimes needed when using images in document templates (PDF generation)</description>
+        </property>
         <!--
             COUNT
         -->

src/CKEditorForMendix/widget/CKEditorForMendix.js

@@ -250,6 +250,11 @@ define([
                 config.resize_enabled = false;
             }
 
+            if (!this.useImageStyleProperty) {
+                config.disallowedContent = "img{width,height}";
+                config.extraAllowedContent = "*[data-*];img[width,height]";
+            }
+
             // Autogrow functionality of the editor.
             if (this.width > 0) {
                 config.width = this.width;
@@ -322,6 +327,12 @@ define([
                     }
                 });
 
+                if (!this.useImageStyleProperty) {
+                    event.editor.filter.addTransformations([
+                        ["img{width,height}: sizeToStyle", "img[width,height]: sizeToAttribute"]
+                    ]);
+                }
+
                 this._updateRendering(callback);
             }));
 

src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="CKEditorForMendix" version="2.4.3" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="CKEditorForMendix" version="2.4.4" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="CKEditorForMendix/CKEditorForMendix.xml"/>
             <widgetFile path="CKEditorForMendix/CKEditorViewerForMendix.xml"/>