X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Floader.js;h=df3819f8d045b2cd857eb1d262cb6a36ce1ff0b3;hb=9afde8772159bd3436f1f5b7862960307710ae5a;hp=87a4d38fe986c0482ee62b18fc7f8637455e98d4;hpb=f8fc585c18d287eb325c575596d183122486b641;p=ckeditor.git diff --git a/_source/core/loader.js b/_source/core/loader.js index 87a4d38..df3819f 100644 --- a/_source/core/loader.js +++ b/_source/core/loader.js @@ -23,7 +23,7 @@ if ( !CKEDITOR.loader ) // Table of script names and their dependencies. 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/range' ], + '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' : [], @@ -41,6 +41,7 @@ if ( !CKEDITOR.loader ) 'core/dom/nodelist' : [ 'core/dom/node' ], 'core/dom/domobject' : [ 'core/dom/event' ], 'core/dom/range' : [ 'core/dom/document', 'core/dom/documentfragment', 'core/dom/element', 'core/dom/walker' ], + 'core/dom/rangelist' : [ 'core/dom/range' ], 'core/dom/text' : [ 'core/dom/node', 'core/dom/domobject' ], 'core/dom/walker' : [ 'core/dom/node' ], 'core/dom/window' : [ 'core/dom/domobject' ], @@ -58,12 +59,11 @@ 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' : [], @@ -83,7 +83,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 ) { @@ -107,7 +107,7 @@ if ( !CKEDITOR.loader ) return path; })(); - var timestamp = 'A4SD49Y'; + var timestamp = 'ABLC4TW'; var getUrl = function( resource ) {