Changeset 6315
- Timestamp:
- 01/12/11 07:10:24 (2 years ago)
- Location:
- CKEditor/trunk/_source
- Files:
-
- 2 edited
-
core/scriptloader.js (modified) (4 diffs)
-
plugins/pastefromword/plugin.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
CKEditor/trunk/_source/core/scriptloader.js
r5986 r6315 34 34 * @param {Object} [scope] The scope ("this" reference) to be used for 35 35 * the callback call. Default to {@link CKEDITOR}. 36 * @param {Boolean} [noCheck] Indicates that the script must be loaded37 * anyway, not checking if it has already loaded.38 36 * @param {Boolean} [showBusy] Changes the cursor of the document while 39 37 + * the script is loaded. … … 54 52 * }); 55 53 */ 56 load : function( scriptUrl, callback, scope, noCheck,showBusy )54 load : function( scriptUrl, callback, scope, showBusy ) 57 55 { 58 56 var isString = ( typeof scriptUrl == 'string' ); … … 112 110 var loadScript = function( url ) 113 111 { 114 if ( noCheck !== true &&uniqueScripts[ url ] )112 if ( uniqueScripts[ url ] ) 115 113 { 116 114 checkLoaded( url, true ); … … 178 176 loadScript( scriptUrl[ i ] ); 179 177 } 180 },181 182 /**183 * Executes a JavaScript code into the current document.184 * @param {String} code The code to be executed.185 * @example186 * CKEDITOR.scriptLoader.loadCode( 'var x = 10;' );187 * alert( x ); // "10"188 */189 loadCode : function( code )190 {191 // Create the <script> element.192 var script = new CKEDITOR.dom.element( 'script' );193 script.setAttribute( 'type', 'text/javascript' );194 script.appendText( code );195 196 // Append it to <head>.197 script.appendTo( CKEDITOR.document.getHead() );198 178 } 199 179 }; -
CKEditor/trunk/_source/plugins/pastefromword/plugin.js
r6311 r6315 95 95 96 96 // Load with busy indicator. 97 CKEDITOR.scriptLoader.load( filterFilePath, callback, null, false,true );97 CKEDITOR.scriptLoader.load( filterFilePath, callback, null, true ); 98 98 } 99 99
Note: See TracChangeset
for help on using the changeset viewer.
