Ticket #3791: 3791_3.patch
File 3791_3.patch, 6.9 KB (added by , 15 years ago) |
---|
-
_source/plugins/scayt/dialogs/options.js
194 194 return false; 195 195 } 196 196 //apply handler 197 dic[ this.getId() ].apply( null, [ this, dic_name, dic_buttons ] );197 window.dic[ this.getId() ].apply( null, [ this, dic_name, dic_buttons ] ); 198 198 199 199 return true; 200 200 } … … 303 303 var suc_massage = captions["succ_dic_create"]; 304 304 //console.info("--plugin "); 305 305 306 scayt.createUserDictionary(dic_name,306 window.scayt.createUserDictionary(dic_name, 307 307 function(arg) 308 308 { 309 309 //console.info( "dic_create callback called with args" , arg ); … … 321 321 322 322 }; 323 323 324 dic.dic_rename = function( el, dic_name , dic_buttons)324 dic.dic_rename = function( el, dic_name ) 325 325 { 326 326 // 327 327 // try to rename dictionary … … 329 329 //console.info ( captions["err_dic_rename"] ) 330 330 var err_massage = captions["err_dic_rename"] || ""; 331 331 var suc_massage = captions["succ_dic_rename"] || ""; 332 scayt.renameUserDictionary(dic_name,332 window.scayt.renameUserDictionary(dic_name, 333 333 function(arg) 334 334 { 335 335 //console.info( "dic_rename callback called with args" , arg ); … … 354 354 355 355 // try to delete dictionary 356 356 // @TODO: delete dict 357 scayt.deleteUserDictionary(357 window.scayt.deleteUserDictionary( 358 358 function(arg) 359 359 { 360 360 //console.info( "dic_delete callback " , dic_name ,arg ); … … 379 379 var err_massage = captions["err_dic_restore"]; 380 380 var suc_massage = captions["succ_dic_restore"]; 381 381 382 scayt.restoreUserDictionary(dic_name,382 window.scayt.restoreUserDictionary(dic_name, 383 383 function(arg) 384 384 { 385 385 //console.info( "dic_restore callback called with args" , arg ); … … 435 435 436 436 // * user dictionary 437 437 if ( userDicActive ){ 438 scayt.getNameUserDictionary(438 window.scayt.getNameUserDictionary( 439 439 function( o ) 440 440 { 441 441 var dic_name = o.dname; -
_source/plugins/scayt/plugin.js
11 11 (function() 12 12 { 13 13 var commandName = 'scaytcheck', 14 sc_on_cssclass = 'scayt_enabled',15 sc_off_cssclass = 'scayt_disabled',16 14 openPage = ''; 17 15 18 16 var onEngineLoad = function() … … 40 38 } 41 39 } 42 40 43 var scayt_control = new scayt( oParams );41 var scayt_control = new window.scayt( oParams ); 44 42 45 43 // Copy config. 46 44 var lastInstance = plugin.instances[ editor.name ]; … … 120 118 121 119 editor.on( 'scaytDialog', function( ev ) // Communication with dialog. 122 120 { 123 ev.data.djConfig = djConfig;121 ev.data.djConfig = window.djConfig; 124 122 ev.data.scayt_control = plugin.getScayt( editor ); 125 123 ev.data.tab = openPage; 126 ev.data.scayt = scayt;124 ev.data.scayt = window.scayt; 127 125 }); 128 126 129 127 var dataProcessor = editor.dataProcessor, … … 157 155 instances : {}, 158 156 getScayt : function( editor ) 159 157 { 160 var instance = this.instances[ editor.name ]; 161 return instance; 158 return this.instances[ editor.name ]; 162 159 }, 163 160 isScaytReady : function( editor ) 164 161 { 165 162 return this.engineLoaded === true && 166 'undefined' !== typeof scayt && this.getScayt( editor );163 'undefined' !== typeof window.scayt && this.getScayt( editor ); 167 164 }, 168 165 isScaytEnabled : function( editor ) 169 166 { … … 379 376 // If the "contextmenu" plugin is loaded, register the listeners. 380 377 if ( editor.contextMenu && editor.addMenuItems ) 381 378 { 382 editor.contextMenu.addListener( function( element , selection)379 editor.contextMenu.addListener( function( element ) 383 380 { 384 381 if ( !( plugin.isScaytEnabled( editor ) && element ) ) 385 382 return null; … … 392 389 393 390 var sLang = scayt_control.getLang(), 394 391 _r = {}, 395 items_suggestion = scayt.getSuggestion( word, sLang );392 items_suggestion = window.scayt.getSuggestion( word, sLang ); 396 393 if (!items_suggestion || !items_suggestion.length ) 397 394 return null; 398 395 // Remove unused commands and menuitems … … 417 414 var exec = ( function( el, s ) 418 415 { 419 416 return { 420 exec: function( editor)417 exec: function() 421 418 { 422 419 scayt_control.replace(el, s); 423 420 } … … 471 468 { 472 469 exec: function() 473 470 { 474 scayt.addWordToUserDictionary( element.$ );471 window.scayt.addWordToUserDictionary( element.$ ); 475 472 } 476 473 }; 477 474 -
_source/plugins/wsc/dialogs/tmpFrameset.html
22 22 return true ; 23 23 } 24 24 25 var opener; 25 26 function tryLoad() 26 27 { 27 28 opener = window.parent; -
_source/plugins/uicolor/dialogs/uicolor.js
13 13 { 14 14 // Convert HEX representation to RGB, stripping # char. 15 15 if ( /^#/.test( color ) ) 16 color = YAHOO.util.Color.hex2rgb( color.substr( 1 ) );16 color = window.YAHOO.util.Color.hex2rgb( color.substr( 1 ) ); 17 17 picker.setValue( color, true ); 18 18 // Refresh picker UI. 19 19 picker.refresh( 'cke_uicolor_picker' ); -
_source/plugins/wsc/dialogs/wsc.js
55 55 initAndSpell( dialog ); 56 56 } 57 57 else if ( i++ == 180 ) // Timeout: 180 * 250ms = 45s. 58 _cancelOnError( errorMsg );58 window._cancelOnError( errorMsg ); 59 59 }; 60 60 } 61 61 … … 78 78 79 79 // global var is used in FCK specific core 80 80 // change on equal var used in fckplugin.js 81 gFCKPluginName = 'wsc';81 window.gFCKPluginName = 'wsc'; 82 82 83 83 LangComparer.setDefaulLangCode( editor.config.defaultLanguage ); 84 84 -
CHANGES.html
176 176 <li><a href="http://dev.fckeditor.net/ticket/4093">#4093</a> : _tests/core/dom/document.html</li> 177 177 <li><a href="http://dev.fckeditor.net/ticket/4094">#4094</a> : Smiley plugin file</li> 178 178 </ul></li> 179 <li><a href="http://dev.fckeditor.net/ticket/3791">#3791</a> : Fix jslint warnings in SCAYT plugin.</li> 179 180 </ul> 180 181 <h3> 181 182 CKEditor 3.0 RC</h3>