X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fskins%2Foffice2003%2Fskin.js;h=43eb314446f9367a46f154c750cee7df0319f069;hb=refs%2Ftags%2Fv3.6.3;hp=fa30b413760fbd7608b70ead5fdb63eda35a5c37;hpb=039a051ccf3901311661022a30afd60fc38130c9;p=ckeditor.git

diff --git a/_source/skins/office2003/skin.js b/_source/skins/office2003/skin.js
index fa30b41..43eb314 100644
--- a/_source/skins/office2003/skin.js
+++ b/_source/skins/office2003/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( 'office2003', (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( 'office2003', (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.
 				var fixSize = 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 );
 					};
 				setTimeout( fixSize, 100 );