X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fthemes%2Fdefault%2Ftheme.js;h=00219fff35d1c82ca2e3d09e94a2f73bd4d03982;hp=1e077d46d0d5517181d9e82d5c18aff134581066;hb=c9fdde67e6384bd5a66adc2b3bba5c4ce9db56c7;hpb=9873d66421922c7aef8be0f5d2ab51e547b19e66 diff --git a/_source/themes/default/theme.js b/_source/themes/default/theme.js index 1e077d4..00219ff 100644 --- a/_source/themes/default/theme.js +++ b/_source/themes/default/theme.js @@ -285,10 +285,6 @@ CKEDITOR.editor.prototype.getThemeSpace = function( spaceName ) */ 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; @@ -297,7 +293,8 @@ CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, res // 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;