X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fskins.js;h=c23dcf22791954cbcb352d2db10efc5a3b921d27;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=b31373e0b43e7c188abc205fb31cb0c1959d9f52;hpb=c6e377a02b54abc07129d72b632763c727476a15;p=ckeditor.git diff --git a/_source/core/skins.js b/_source/core/skins.js index b31373e..c23dcf2 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-2011, 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.