Ticket #6187: 6187_2.patch
File 6187_2.patch, 3.7 KB (added by , 14 years ago) |
---|
-
_source/core/_bootstrap.js
66 66 } 67 67 }); 68 68 69 /* 70 TODO: Enable the following and check if effective. 71 69 // Needed for IE6 to not request image (HTTP 200 or 304) for every CSS background. (#6187) 72 70 if ( CKEDITOR.env.ie ) 73 71 { 74 72 // Remove IE mouse flickering on IE6 because of background images. … … 82 80 // line. For safety, let's just ignore errors. 83 81 } 84 82 } 85 */86 83 87 84 /** 88 85 * Fired when a CKEDITOR core object is fully loaded and ready for interaction. -
_source/core/skins.js
55 55 } 56 56 57 57 // Check if we need to preload images from it. 58 if ( !preloaded[ skinName ] ) 59 { 60 var preload = skinDefinition.preload; 61 if ( preload && preload.length > 0 ) 62 { 58 var preload = skinDefinition.preload; 59 if ( preload && preload.length > 0 ) 60 { 61 if ( !preloaded[ skinName ] ) 62 { 63 // Prepare image URLs 63 64 appendSkinPath( preload ); 64 CKEDITOR.imageCacher.load( preload, function() 65 { 66 preloaded[ skinName ] = 1; 65 66 // Get preloader event dispatcher object. 67 preloaded[ skinName ] = CKEDITOR.imageCacher.load( preload ); 68 } 69 70 if ( !preloaded[ skinName ].finished ) 71 { 72 // Bind listener for this editor instance. 73 preloaded[ skinName ].on( 'preloaded', function() 74 { 67 75 loadPart( editor, skinName, part, callback ); 68 } ); 69 return; 70 } 76 } 77 ); 71 78 72 // Mark it as preloaded. 73 preloaded[ skinName ] = 1; 74 } 79 // Execution will be continued from event listener. 80 return; 81 } 82 } 75 83 76 84 // Get the part definition. 77 85 part = skinDefinition[ part ]; -
_source/core/loader.js
59 59 'core/htmlparser/cdata' : [ 'core/htmlparser' ], 60 60 'core/htmlparser/filter' : [ 'core/htmlparser' ], 61 61 'core/htmlparser/basicwriter': [ 'core/htmlparser' ], 62 'core/imagecacher' : [ 'core/dom/element' ],62 'core/imagecacher' : [ 'core/dom/element', 'core/event' ], 63 63 'core/lang' : [], 64 64 'core/plugins' : [ 'core/resourcemanager' ], 65 65 'core/resourcemanager' : [ 'core/scriptloader', 'core/tools' ], -
_source/core/imagecacher.js
32 32 /** 33 33 * Loads one or more images. 34 34 * @param {Array} images The URLs for the images to be loaded. 35 * @param {Function} callback The function to be called once all images 36 * are loaded. 35 * @param {Function} callback The optional function to be called once all images 36 * are loaded. You can bind any function to the returned event object. 37 * @return {CKEDITOR.event} Event object which fires 'preloaded' event when all images finished. 38 * Additionally it set "finished" property flag after 'preloaded' event. 37 39 */ 38 40 load : function( images, callback ) 39 41 { 40 42 var pendingCount = images.length; 41 43 44 var event = new CKEDITOR.event; 45 event.on( 'preloaded', function() 46 { 47 event.finished = true; 48 }); 49 50 if ( callback ) 51 event.on( 'preloaded', callback ); 52 42 53 var checkPending = function() 43 54 { 44 55 if ( --pendingCount === 0 ) 45 callback();56 event.fire( 'preloaded' ); 46 57 }; 47 58 48 59 for ( var i = 0 ; i < images.length ; i++ ) … … 54 65 else 55 66 loadImage( image, checkPending ); 56 67 } 68 69 return event; 57 70 } 58 71 }; 59 72 })();