Ticket #5547: image-width-and-height-attributes.diff

_source/plugins/image/dialogs/image.js

@@ -661 +661 @@
                                                                                                                                 var value = this.getValue();
                                                                                                                                 if ( type == IMAGE )
                                                                                                                                 {
-                                                                                                                                        if ( value )
+                                                                                                                                        if ( value ) {
                                                                                                                                                 element.setStyle( 'width', CKEDITOR.tools.cssLength( value ) );
-                                                                                                                                        else
+                                                                                                                                                element.setAttribute( 'width', value );
+                                  } else {
                                                                                                                                                 element.removeStyle( 'width' );
-
-                                                                                                                                        !internalCommit && element.removeAttribute( 'width' );
+                                                                                                                                                element.removeAttribute( 'width' );
+                                  }
                                                                                                                                 }
                                                                                                                                 else if ( type == PREVIEW )
                                                                                                                                 {
@@ -674 +675 @@
                                                                                                                                         if ( !aMatch )
                                                                                                                                         {
                                                                                                                                                 var oImageOriginal = this.getDialog().originalElement;
-                                                                                                                                                if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+                                                                                                                                                if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' ) {
                                                                                                                                                         element.setStyle( 'width',  oImageOriginal.$.width + 'px');
+                                                                                                                                                        element.setAttribute( 'width',  oImageOriginal.$.width );
+                                    }
                                                                                                                                         }
-                                                                                                                                        else
+                                                                                                                                        else {
                                                                                                                                                 element.setStyle( 'width', CKEDITOR.tools.cssLength( value ) );
+                                                                                                                                                element.setAttribute( 'width', value );
+                                  }
                                                                                                                                 }
                                                                                                                                 else if ( type == CLEANUP )
                                                                                                                                 {
@@ -711 +716 @@
                                                                                                                                 var value = this.getValue();
                                                                                                                                 if ( type == IMAGE )
                                                                                                                                 {
-                                                                                                                                        if ( value )
+                                                                                                                                        if ( value ) {
                                                                                                                                                 element.setStyle( 'height', CKEDITOR.tools.cssLength( value ) );
-                                                                                                                                        else
+                                                                                                                                                element.setAttribute( 'height', value );
+                                  } else {
                                                                                                                                                 element.removeStyle( 'height' );
-
-                                                                                                                                        !internalCommit && element.removeAttribute( 'height' );
+                                                                                                                                                element.removeAttribute( 'height' );
+                                  }
                                                                                                                                 }
                                                                                                                                 else if ( type == PREVIEW )
                                                                                                                                 {
@@ -724 +730 @@
                                                                                                                                         if ( !aMatch )
                                                                                                                                         {
                                                                                                                                                 var oImageOriginal = this.getDialog().originalElement;
-                                                                                                                                                if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+                                                                                                                                                if ( oImageOriginal.getCustomData( 'isReady' ) == 'true' ) {
                                                                                                                                                         element.setStyle( 'height', oImageOriginal.$.height + 'px' );
+                                                                                                                                                        element.setAttribute( 'height', oImageOriginal.$.height );
+                                    }
                                                                                                                                         }
-                                                                                                                                        else
+                                                                                                                                        else {
                                                                                                                                                 element.setStyle( 'height',  CKEDITOR.tools.cssLength( value ) );
+                                                                                                                                                element.setAttribute( 'height', value );
+                                  }
                                                                                                                                 }
                                                                                                                                 else if ( type == CLEANUP )
                                                                                                                                 {