X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fskins%2Fkama%2Fskin.js;h=c52994217ace32cdcfbb906de5e96fa9cdbb1a5a;hb=9afde8772159bd3436f1f5b7862960307710ae5a;hp=55a97dcda7f516b9a4e17a03a0d7ccde14649a5f;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git

diff --git a/_source/skins/kama/skin.js b/_source/skins/kama/skin.js
index 55a97dc..c529942 100644
--- a/_source/skins/kama/skin.js
+++ b/_source/skins/kama/skin.js
@@ -5,18 +5,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 CKEDITOR.skins.add( 'kama', (function()
 {
-	var preload = [],
-		uiColorStylesheetId = 'cke_ui_color';
-
-	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' );
-	}
+	var uiColorStylesheetId = 'cke_ui_color';
 
 	return {
-		preload		: preload,
 		editor		: { css : [ 'editor.css' ] },
 		dialog		: { css : [ 'dialog.css' ] },
 		templates	: { css : [ 'templates.css' ] },
@@ -93,7 +84,7 @@ CKEDITOR.skins.add( 'kama', (function()
 			function getStylesheet( document )
 			{
 				var node = document.getById( uiColorStylesheetId );
-				if( !node )
+				if ( !node )
 				{
 					node = document.getHead().append( 'style' );
 					node.setAttribute( "id", uiColorStylesheetId );
@@ -147,7 +138,7 @@ CKEDITOR.skins.add( 'kama', (function()
 				{
 					var cssContent,
 						uiStyle = getStylesheet( CKEDITOR.document ),
-						cssId = '.cke_editor_' + CKEDITOR.tools.escapeCssSelector( editor.name );
+						cssId = '.' + editor.id;
 
 					var cssSelectors =
 						[
@@ -242,11 +233,11 @@ CKEDITOR.skins.add( 'kama', (function()
 
 						// ml
 						el = innerDialog.getChild( 4 );
-						el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
+						el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
 
 						// mr
 						el = innerDialog.getChild( 5 );
-						el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
+						el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
 					},
 					100 );
 			});