Ticket #5700: 5700.2.patch

_source/plugins/scayt/dialogs/options.js

@@ -179 +179 @@
                 onOk : function()
                 {
                         var scayt_control =  this.data.scayt_control;
-                        scayt_control.option( this.options );
-                        // Setup languge if it was changed.
                         var csLang = this.chosed_lang;
-                        scayt_control.setLang( csLang );
-                        scayt_control.refresh();
+                        var options = this.options;
+                        window.setTimeout(function(){
+                                scayt_control.option( options );
+                                // Setup languge if it was changed.
+                                
+                                if(scayt_control.sLang != csLang)
+                                        scayt_control.setLang( csLang );
+                                else
+                                        scayt_control.refresh();
+                        }, 50);
                 },
                 onCancel: function()
                 {

_source/plugins/scayt/plugin.js

@@ -184 +184 @@
                                                 }, 10 );
                                 }
                         });
+                editor.on( 'insertHTML', function()
+                {
+                        var scayt_instance = plugin.getScayt( editor );
+                        if ( plugin.isScaytEnabled( editor ) )
+                        {
+                                // Unlock the selection before reload, SCAYT will take
+                                // care selection update.
+                                if ( CKEDITOR.env.ie )
+                                        editor.getSelection().unlock( true );
 
-                // Reload spell-checking for current word after insertion completed.
-                editor.on( 'insertElement', function()
-                        {
-                                var scayt_instance = plugin.getScayt( editor );
-                                if ( plugin.isScaytEnabled( editor ) )
+                                // Return focus to the editor and refresh SCAYT markup (#5573).
+                                window.setTimeout( function()
                                 {
-                                        // Unlock the selection before reload, SCAYT will take
-                                        // care selection update.
-                                        if ( CKEDITOR.env.ie )
-                                                editor.getSelection().unlock( true );
-
-                                        // Return focus to the editor and refresh SCAYT markup (#5573).
-                                        window.setTimeout( function()
-                                        {
-                                                scayt_instance.focus();
-                                                scayt_instance.refresh();
-                                        }, 10 );
+                                        scayt_instance.focus();
+                                        scayt_instance.refresh();
+                                }, 10 );
+                        }
+                }, this, null, 50 );
+                
+                                // Reload spell-checking for current word after insertion completed.
+                editor.on( 'insertElement', function()
+                        {
+                                var scayt_instance = plugin.getScayt( editor );
+                                if ( plugin.isScaytEnabled( editor ) )
+                                {
+                                        // Unlock the selection before reload, SCAYT will take
+                                        // care selection update.
+                                        if ( CKEDITOR.env.ie )
+                                                editor.getSelection().unlock( true );
+ 
+                                        // Return focus to the editor and refresh SCAYT markup (#5573).
+                                        window.setTimeout( function()
+                                        {
+                                                scayt_instance.focus();
+                                                scayt_instance.refresh();
+                                        }, 10 );
                                 }
-                        }, this, null, 50 );
-
-                editor.on( 'insertHtml', function()
+                        }, this, null, 50 );
+                
+                editor.on( 'dialogShow', function( ev )
                         {
-                                var scayt_instance = plugin.getScayt( editor );
-                                if ( plugin.isScaytEnabled( editor ) )
-                                {
-                                        // Unlock the selection before reload, SCAYT will take
-                                        // care selection update.
-                                        if ( CKEDITOR.env.ie )
-                                                editor.getSelection().unlock( true );
-
-                                        // Return focus to the editor (#5573)
-                                        // Refresh SCAYT markup
+                                var editor = ev.editor;
+                                if ( plugin.isScaytEnabled( editor ) ) {
+                                                var instance = plugin.getScayt( editor );
+                                                instance.setPaused(true);
+                                }
+                        });
+                
+                editor.on( 'dialogHide', function( ev )
+                        {
+                                var editor = ev.editor;
+                                if ( plugin.isScaytEnabled( editor ) ) {
                                         window.setTimeout( function()
-                                        {
-                                                scayt_instance.focus();
-                                                scayt_instance.refresh();
-                                        }, 10 );
+                                                {
+                                                        var instance = plugin.getScayt( editor );
+                                
+                                                        instance.setPaused(false);
+                                                        instance && instance.refresh();
+                                                }, 1 );
                                 }
-                        }, this, null, 50 );
+                        });
 
                 editor.on( 'scaytDialog', function( ev )        // Communication with dialog.
                         {