X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Floader.js;h=d8a8302590c86acc2ff34dd828d9f14e0898a346;hb=f0610347140239143439a511ee2bd48cb784f470;hp=2e23d7e8705973e1dd237d3f86a11cc9e7e2732b;hpb=9873d66421922c7aef8be0f5d2ab51e547b19e66;p=ckeditor.git diff --git a/_source/core/loader.js b/_source/core/loader.js index 2e23d7e..d8a8302 100644 --- a/_source/core/loader.js +++ b/_source/core/loader.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 */ @@ -24,7 +24,6 @@ if ( !CKEDITOR.loader ) var scripts = { 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/plugins', 'core/scriptloader', 'core/tools', /* The following are entries that we want to force loading at the end to avoid dependence recursion */ 'core/dom/comment', 'core/dom/elementpath', 'core/dom/text', 'core/dom/rangelist' ], - 'core/ajax' : [ 'core/xml' ], 'core/ckeditor' : [ 'core/ckeditor_basic', 'core/dom', 'core/dtd', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/htmlparser', 'core/htmlparser/element', 'core/htmlparser/fragment', 'core/htmlparser/filter', 'core/htmlparser/basicwriter', 'core/tools' ], 'core/ckeditor_base' : [], 'core/ckeditor_basic' : [ 'core/editor_basic', 'core/env', 'core/event' ], @@ -59,16 +58,14 @@ if ( !CKEDITOR.loader ) 'core/htmlparser/cdata' : [ 'core/htmlparser' ], 'core/htmlparser/filter' : [ 'core/htmlparser' ], 'core/htmlparser/basicwriter': [ 'core/htmlparser' ], - 'core/imagecacher' : [ 'core/dom/element' ], 'core/lang' : [], 'core/plugins' : [ 'core/resourcemanager' ], 'core/resourcemanager' : [ 'core/scriptloader', 'core/tools' ], 'core/scriptloader' : [ 'core/dom/element', 'core/env' ], - 'core/skins' : [ 'core/imagecacher', 'core/scriptloader' ], + 'core/skins' : [ 'core/scriptloader' ], 'core/themes' : [ 'core/resourcemanager' ], 'core/tools' : [ 'core/env' ], - 'core/ui' : [], - 'core/xml' : [ 'core/env' ] + 'core/ui' : [] }; var basePath = (function() @@ -84,7 +81,7 @@ if ( !CKEDITOR.loader ) for ( var i = 0 ; i < scripts.length ; i++ ) { - var match = scripts[i].src.match( /(^|.*[\\\/])core\/loader.js(?:\?.*)?$/i ); + var match = scripts[i].src.match( /(^|.*?[\\\/])(?:_source\/)?core\/loader.js(?:\?.*)?$/i ); if ( match ) { @@ -108,7 +105,7 @@ if ( !CKEDITOR.loader ) return path; })(); - var timestamp = 'A7HG4HT'; + var timestamp = 'B5GJ5GG'; var getUrl = function( resource ) {