Index: /CKEditor/trunk/_source/plugins/scayt/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/scayt/plugin.js (revision 5333) +++ /CKEditor/trunk/_source/plugins/scayt/plugin.js (revision 5334) @@ -42,9 +42,9 @@ oParams.srcNodeRef = editor.document.getWindow().$.frameElement; // syntax : AppName.AppVersion@AppRevision - oParams.assocApp = "CKEDITOR." + CKEDITOR.version + "@" + CKEDITOR.revision; - oParams.customerid = editor.config.scayt_customerid || "1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2"; + oParams.assocApp = 'CKEDITOR.' + CKEDITOR.version + '@' + CKEDITOR.revision; + oParams.customerid = editor.config.scayt_customerid || '1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2'; oParams.customDictionaryIds = editor.config.scayt_customDictionaryIds || ''; oParams.userDictionaryName = editor.config.scayt_userDictionaryName || ''; - oParams.sLang = editor.config.scayt_sLang || "en_US"; + oParams.sLang = editor.config.scayt_sLang || 'en_US'; oParams.onBeforeChange = function() @@ -62,8 +62,8 @@ } } - + // needs for restoring a specific scayt control settings if ( scayt_control_id ) oParams.id = scayt_control_id; - + var scayt_control = new window.scayt( oParams ); @@ -118,10 +118,11 @@ if ( (ev.data.name == 'source' || ev.data.name == 'newpage') && editor.mode == 'wysiwyg' ) { - var scayt_instanse = plugin.getScayt( editor ); - if ( scayt_instanse ) - { - scayt_paused = scayt_instanse.paused = !scayt_instanse.disabled; - scayt_control_id = scayt_instanse.id; - scayt_instanse.destroy( true ); + var scayt_instance = plugin.getScayt( editor ); + if ( scayt_instance ) + { + scayt_paused = scayt_instance.paused = !scayt_instance.disabled; + // store a control id for restore a specific scayt control settings + scayt_control_id = scayt_instance.id; + scayt_instance.destroy( true ); delete plugin.instances[ editor.name ]; } @@ -129,15 +130,19 @@ }); - - editor.on( 'destroy', function() - { - scayt_control_id = scayt_instanse.id; - plugin.getScayt( editor ).destroy( true ); + editor.on( 'destroy', function( ev ) + { + var editor = ev.editor, + scayt_instance = plugin.getScayt( editor ); + // store a control id for restore a specific scayt control settings + scayt_control_id = scayt_instance.id; + scayt_instance.destroy( true ); + delete plugin.instances[ editor.name ]; }); + // Listen to data manipulation to reflect scayt markup. editor.on( 'afterSetData', function() { if ( plugin.isScaytEnabled( editor ) ) { - window.setTimeout( function(){ plugin.getScayt( editor ).refresh() }, 10 ); + window.setTimeout( function(){ plugin.getScayt( editor ).refresh(); }, 10 ); } }); @@ -155,5 +160,5 @@ // Swallow any SCAYT engine errors. - window.setTimeout( function(){ scayt_instance.refresh() }, 10 ); + window.setTimeout( function(){ scayt_instance.refresh(); }, 10 ); } }, this, null, 50 ); @@ -161,5 +166,4 @@ editor.on( 'insertHtml', function() { - var scayt_instance = plugin.getScayt( editor ); if ( plugin.isScaytEnabled( editor ) ) @@ -171,7 +175,5 @@ // Swallow any SCAYT engine errors. - - window.setTimeout( function(){ scayt_instance.refresh() },10 ); - + window.setTimeout( function(){ scayt_instance.refresh(); },10 ); } }, this, null, 50 ); @@ -187,4 +189,5 @@ var dataProcessor = editor.dataProcessor, htmlFilter = dataProcessor && dataProcessor.htmlFilter; + if ( htmlFilter ) { @@ -225,6 +228,6 @@ isScaytEnabled : function( editor ) { - var scayt_instanse = this.getScayt( editor ); - return ( scayt_instanse ) ? scayt_instanse.disabled === false : false; + var scayt_instance = this.getScayt( editor ); + return ( scayt_instance ) ? scayt_instance.disabled === false : false; }, loadEngine : function( editor ) @@ -245,5 +248,5 @@ this, null, - 0 + 0 ); // First to run. @@ -254,8 +257,8 @@ // Default to 'http' for unknown. protocol = protocol.search( /https?:/) != -1? protocol : 'http:'; - var baseUrl = "svc.spellchecker.net/spellcheck31/lf/scayt/scayt22.js"; - - var scaytUrl = editor.config.scayt_srcUrl || ( protocol + "//" + baseUrl ); - var scaytConfigBaseUrl = plugin.parseUrl( scaytUrl ).path + "/"; + var baseUrl = 'svc.spellchecker.net/spellcheck31/lf/scayt/scayt22.js'; + + var scaytUrl = editor.config.scayt_srcUrl || ( protocol + '//' + baseUrl ); + var scaytConfigBaseUrl = plugin.parseUrl( scaytUrl ).path + '/'; CKEDITOR._djScaytConfig = @@ -266,5 +269,5 @@ function() { - CKEDITOR.fireOnce( "scaytReady" ); + CKEDITOR.fireOnce( 'scaytReady' ); } ], @@ -366,13 +369,13 @@ CKEDITOR.dialog.add( commandName, CKEDITOR.getUrl( this.path + 'dialogs/options.js' ) ); // read ui tags - var confuiTabs = editor.config.scayt_uiTabs || "1,1,1"; + var confuiTabs = editor.config.scayt_uiTabs || '1,1,1'; var uiTabs =[]; - // string tp array convert - confuiTabs = confuiTabs.split(","); - // check array length ! allwaays must be 3 filled with 1 or 0 + // string to array convert + confuiTabs = confuiTabs.split( ',' ); + // check array length ! always must be 3 filled with 1 or 0 for (var i=0,l=3; i