Ticket #5720: 5720_2.patch

_source/plugins/scayt/plugin.js

@@ -55 +55 @@
                                                 this.addStyle( this.selectorCss(), 'padding-bottom: 2px !important;' );
 
                                         // Call scayt_control.focus when SCAYT loaded
-                                        // and only if editor has focus
-                                        if ( editor.focusManager.hasFocus )
+                                        // and only if editor has focus and scayt control creates at first time (5720 ticket)
+                                        if ( editor.focusManager.hasFocus && !plugin.isControlRestored( editor ) )
                                                 this.focus();
 
                                 };
@@ -146 +146 @@
                                                 delete plugin.instances[ editor.name ];
                                         }
                                 }
+                                // Catch on source mode switch off (5720 ticket)
+                                else if ( ev.data.name == 'source'  && editor.mode == 'source' )
+                                {
+                                        plugin.markControlRestore( editor )
+                                }
                         });
 
                 editor.on( 'afterCommandExec', function( ev )
@@ -281 +286 @@
         {
                 engineLoaded : false,
                 instances : {},
+                controlInfo : {},
+                isControlRestored : function ( editor ){
+                        return this.controlInfo[editor.name] && this.controlInfo[editor.name].restored ;
+                },
+                markControlRestore : function ( editor ){
+                        this.controlInfo[editor.name] = {};
+                        this.controlInfo[editor.name].restored = true;
+                },
                 getScayt : function( editor )
                 {
                         return this.instances[ editor.name ];
@@ -739 +752 @@
                                 elementsPathFilters.push( scaytFilter );
 
                         editor.addRemoveFormatFilter && editor.addRemoveFormatFilter( scaytFilter );
-
+                        
                 }
         });
 })();