X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fskins.js;h=f91d45c5fbdbeabb3b6dc8358d72fa9f3a8bb45a;hb=2f22c0c38f17e75be5541089076885442aaa2377;hp=2876e55c32571d88f92416b478601bc18938b22f;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git

diff --git a/_source/core/skins.js b/_source/core/skins.js
index 2876e55..f91d45c 100644
--- a/_source/core/skins.js
+++ b/_source/core/skins.js
@@ -1,5 +1,5 @@
 /*
-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
 */
 
@@ -16,9 +16,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 CKEDITOR.skins = (function()
 {
 	// Holds the list of loaded skins.
-	var loaded = {};
-	var preloaded = {};
-	var paths = {};
+	var loaded = {},
+		paths = {};
 
 	var loadPart = function( editor, skinName, part, callback )
 	{
@@ -54,25 +53,6 @@ CKEDITOR.skins = (function()
 					} );
 		}
 
-		// Check if we need to preload images from it.
-		if ( !preloaded[ skinName ] )
-		{
-			var preload = skinDefinition.preload;
-			if ( preload && preload.length > 0 )
-			{
-				appendSkinPath( preload );
-				CKEDITOR.imageCacher.load( preload, function()
-					{
-						preloaded[ skinName ] = 1;
-						loadPart( editor, skinName, part, callback );
-					} );
-				return;
-			}
-
-			// Mark it as preloaded.
-			preloaded[ skinName ] = 1;
-		}
-
 		// Get the part definition.
 		part = skinDefinition[ part ];
 		var partIsLoaded = !part || !!part._isLoaded;
@@ -93,8 +73,8 @@ CKEDITOR.skins = (function()
 
 			// Check whether the "css" and "js" properties have been defined
 			// for that part.
-			var cssIsLoaded = !part.css || !part.css.length;
-			var jsIsLoaded = !part.js || !part.js.length;
+			var cssIsLoaded = !part.css || !part.css.length,
+				jsIsLoaded = !part.js || !part.js.length;
 
 			// This is the function that will trigger the callback calls on
 			// load.
@@ -194,7 +174,7 @@ CKEDITOR.skins = (function()
 			else
 			{
 				paths[ skinName ] = skinPath;
-				CKEDITOR.scriptLoader.load( skinPath + 'skin.js', function()
+				CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( skinPath + 'skin.js' ), function()
 						{
 							 loadPart( editor, skinName, skinPart, callback );
 						});