Ticket #5353: 5353.patch

_source/core/dom/element.js

@@ -1437 +1437 @@
                                         if ( !event.data.getTarget().hasClass( 'cke_enable_context_menu' ) )
                                                 event.data.preventDefault();
                                 } );
-                }
+                },
+
+                /**
+                 *  Update the element's size with box model awareness.
+                 * @name CKEDITOR.dom.element.setSize
+                 * @param {String} type [width|height]
+                 * @param {Number} size The length unit in px.
+                 * @param isBorderBox Apply the {@param width} and {@param height} based on border box model.
+                 */
+                setSize : ( function()
+                {
+                        var sides = {
+                                width : [ "border-left-width", "border-right-width","padding-left", "padding-right" ],
+                                height : [ "border-top-width", "border-bottom-width", "padding-top",  "padding-bottom" ]
+                        };
+
+                        return function( type, size, isBorderBox )
+                        {
+                                if ( typeof size == 'number' )
+                                {
+                                        if ( isBorderBox && !( CKEDITOR.env.ie && CKEDITOR.env.quirks ) )
+                                        {
+                                                var     adjustment = 0;
+                                                for ( var i = 0, len = sides [ type ].length; i < len; i++ )
+                                                        adjustment += parseInt( this.getComputedStyle( sides [ type ][ i ] ) || 0, 10 );
+                                                size -= adjustment;
+                                        }
+                                        this.setStyle( type, size + 'px' );
+                                }
+                        }
+                })()
         });

_source/themes/default/theme.js

@@ -275 +275 @@
 
 CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, resizeInner )
 {
-        var numberRegex = /^\d+$/;
-        if ( numberRegex.test( width ) )
-                width += 'px';
-
         var container = this.container,
                 contents = CKEDITOR.document.getById( 'cke_contents_' + this.name ),
                 outer = resizeInner ? container.getChild( 1 ) : container;
@@ -287 +283 @@
         // WEBKIT BUG: Webkit requires that we put the editor off from display when we
         // resize it. If we don't, the browser crashes!
         CKEDITOR.env.webkit && outer.setStyle( 'display', 'none' );
-        outer.setStyle( 'width', width );
+        // Set as border box width. (#5353)
+        outer.setSize( 'width',  width, true );
         if ( CKEDITOR.env.webkit )
         {
                 outer.$.offsetWidth;