/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
CKEDITOR.skins = (function()\r
{\r
// Holds the list of loaded skins.\r
- var loaded = {};\r
- var preloaded = {};\r
- var paths = {};\r
+ var loaded = {},\r
+ paths = {};\r
\r
var loadPart = function( editor, skinName, part, callback )\r
{\r
} );\r
}\r
\r
- // Check if we need to preload images from it.\r
- if ( !preloaded[ skinName ] )\r
- {\r
- var preload = skinDefinition.preload;\r
- if ( preload && preload.length > 0 )\r
- {\r
- appendSkinPath( preload );\r
- CKEDITOR.imageCacher.load( preload, function()\r
- {\r
- preloaded[ skinName ] = 1;\r
- loadPart( editor, skinName, part, callback );\r
- } );\r
- return;\r
- }\r
-\r
- // Mark it as preloaded.\r
- preloaded[ skinName ] = 1;\r
- }\r
-\r
// Get the part definition.\r
part = skinDefinition[ part ];\r
var partIsLoaded = !part || !!part._isLoaded;\r
\r
// Check whether the "css" and "js" properties have been defined\r
// for that part.\r
- var cssIsLoaded = !part.css || !part.css.length;\r
- var jsIsLoaded = !part.js || !part.js.length;\r
+ var cssIsLoaded = !part.css || !part.css.length,\r
+ jsIsLoaded = !part.js || !part.js.length;\r
\r
// This is the function that will trigger the callback calls on\r
// load.\r
else\r
{\r
paths[ skinName ] = skinPath;\r
- CKEDITOR.scriptLoader.load( skinPath + 'skin.js', function()\r
+ CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( skinPath + 'skin.js' ), function()\r
{\r
loadPart( editor, skinName, skinPart, callback );\r
});\r