X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fskins%2Fv2%2Fskin.js;h=769e53e94ab80876dc2e410d2191ef31902d4d83;hb=refs%2Ftags%2Fv3.6.4;hp=f7d5060133e79c13bb02023351ae2783e7c37e95;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git

diff --git a/_source/skins/v2/skin.js b/_source/skins/v2/skin.js
index f7d5060..769e53e 100644
--- a/_source/skins/v2/skin.js
+++ b/_source/skins/v2/skin.js
@@ -1,23 +1,14 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
 CKEDITOR.skins.add( 'v2', (function()
 {
-	var preload = [];
-
-	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 7 )
-	{
-		// For IE6, we need to preload some images, otherwhise they will be
-		// downloaded several times (CSS background bug).
-		preload.push( 'icons.png', 'images/sprites_ie6.png', 'images/dialog_sides.gif' );
-	}
-
 	return {
-		preload		: preload,
 		editor		: { css : [ 'editor.css' ] },
 		dialog		: { css : [ 'dialog.css' ] },
+		separator		: { canGroup: false },
 		templates	: { css : [ 'templates.css' ] },
 		margins		: [ 0, 14, 18, 14 ]
 	};
@@ -46,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', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
+						el.setSize( 'height', height );
 
 						// mr
 						el = innerDialog.getChild( 5 );
-						el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
+						el.setSize( 'height', height );
 					},
 					100 );
 			});