X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fskins%2Fv2%2Fskin.js;h=d22db87434f6e0b2e2839ef7f78dae8ba32e9a11;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=2abbbcfe8ccc952d83842b6d63dd9e112036b6d0;hpb=9afde8772159bd3436f1f5b7862960307710ae5a;p=ckeditor.git diff --git a/_source/skins/v2/skin.js b/_source/skins/v2/skin.js index 2abbbcf..d22db87 100644 --- a/_source/skins/v2/skin.js +++ b/_source/skins/v2/skin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -8,6 +8,7 @@ CKEDITOR.skins.add( 'v2', (function() return { editor : { css : [ 'editor.css' ] }, dialog : { css : [ 'dialog.css' ] }, + separator : { canGroup: false }, templates : { css : [ 'templates.css' ] }, margins : [ 0, 14, 18, 14 ] }; @@ -36,30 +37,32 @@ CKEDITOR.skins.add( 'v2', (function() height : height + 'px' }); - if ( !CKEDITOR.env.ie ) + if ( !CKEDITOR.env.ie || CKEDITOR.env.ie9Compat ) return; // Fix the size of the elements which have flexible lengths. setTimeout( function() { var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ), - body = innerDialog.getChild( 0 ); + body = innerDialog.getChild( 0 ), + bodyWidth = body.getSize( 'width' ); + height += body.getChild( 0 ).getSize( 'height' ) + 1; // tc var el = innerDialog.getChild( 2 ); - el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' ); + el.setSize( 'width', bodyWidth ); // bc el = innerDialog.getChild( 7 ); - el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' ); + el.setSize( 'width', bodyWidth - 28 ); // ml el = innerDialog.getChild( 4 ); - el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' ); + el.setSize( 'height', height ); // mr el = innerDialog.getChild( 5 ); - el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' ); + el.setSize( 'height', height ); }, 100 ); });