Ticket #9439: 9439.patch

_source/plugins/scayt/plugin.js

@@ -35 +35 @@
 
                 var createInstance = function() // Create new instance every time Document is created.
                 {
+                        if(typeof plugin.instances[ editor.name ] != 'undefined' || plugin.instances[ editor.name ] != null)
+                        {
+                                plugin.instances[ editor.name ].destroy();
+                        }
                         var config = editor.config;
                         // Initialise Scayt instance.
                         var oParams = {};
@@ -78 +82 @@
                                 oParams.id = plugin.getControlId( editor );
 
                         var scayt_control = new window.scayt( oParams );
-
                         scayt_control.afterMarkupRemove.push( function( node )
                         {
                                 ( new CKEDITOR.dom.element( node, scayt_control.document ) ).mergeSiblings();
@@ -102 +105 @@
                         editor.fire( 'showScaytState' );
                 };
 
-                editor.on( 'contentDom', createInstance );
+                editor.on( 'contentDom', function(ev)
+                        {
+                                createInstance(); 
+                        });
                 editor.on( 'contentDomUnload', function()
                         {
                                 // Remove scripts.
@@ -123 +129 @@
 
                 editor.on( 'beforeCommandExec', function( ev )          // Disable SCAYT before Source command execution.
                         {
-                                if ( ( ev.data.name == 'source' || ev.data.name == 'newpage' ) && editor.mode == 'wysiwyg' )
-                                {
-                                        var scayt_instance = plugin.getScayt( editor );
-                                        if ( scayt_instance )
-                                        {
-                                                plugin.setPaused( editor, !scayt_instance.disabled );
-                                                // store a control id for restore a specific scayt control settings
-                                                plugin.setControlId( editor, scayt_instance.id );
-                                                scayt_instance.destroy( true );
-                                                delete plugin.instances[ editor.name ];
-                                        }
-                                }
-                                // Catch on source mode switch off (#5720)
-                                else if ( ev.data.name == 'source'  && editor.mode == 'source' )
+                                if ( ev.data.name == 'source'  && editor.mode == 'source' )
                                         plugin.markControlRestore( editor );
                         });
 
@@ -148 +141 @@
                                 if ( editor.mode == 'wysiwyg' && ( ev.data.name == 'undo' || ev.data.name == 'redo' ) )
                                         window.setTimeout( function() { plugin.getScayt( editor ).refresh(); }, 10 );
                         });
-
                 editor.on( 'destroy', function( ev )
                         {
                                 var editor = ev.editor,
@@ -163 +155 @@
                                 plugin.setControlId( editor, scayt_instance.id );
                                 scayt_instance.destroy( true );
                         });
-
-                // Listen to data manipulation to reflect scayt markup.
-                editor.on( 'afterSetData', function()
+                //#9439 after SetData method fires contentDom event and SCAYT create additional instanse
+                // This way we should destroy SCAYT on setData event when contenteditable Iframe was re-created
+                editor.on( 'setData', function( ev )
                         {
-                                if ( plugin.isScaytEnabled( editor ) ) {
-                                        window.setTimeout( function()
-                                                {
-                                                        var instance = plugin.getScayt( editor );
-                                                        instance && instance.refresh();
-                                                }, 10 );
-                                }
+                                var scayt_instance = plugin.getScayt( editor );
+                                        if ( scayt_instance )
+                                        {
+                                                plugin.setPaused( editor, !scayt_instance.disabled );
+                                                // store a control id for restore a specific scayt control settings
+                                                plugin.setControlId( editor, scayt_instance.id );
+                                                scayt_instance.destroy( true );
+                                                delete plugin.instances[ editor.name ];
+                                        }
                         });
 
                 // Reload spell-checking for current word after insertion completed.
@@ -374 +368 @@
                                 return editor.fire( 'showScaytState' );
 
                         if ( this.engineLoaded === true )
-                                return onEngineLoad.apply( editor );    // Add new instance.
-                        else if ( this.engineLoaded == -1 )                     // We are waiting.
+                        {
+                                return onEngineLoad.apply( editor );                            
+                        }
+                                // Add new instance.
+                        else if ( this.engineLoaded == -1 )     
+                        {       // We are waiting.
                                 return CKEDITOR.on( 'scaytReady', function(){ onEngineLoad.apply( editor ); } );        // Use function(){} to avoid rejection as duplicate.
+                        }
 
                         CKEDITOR.on( 'scaytReady', onEngineLoad, editor );
                         CKEDITOR.on( 'scaytReady', function()
@@ -427 +426 @@
                                 );
                         }
                         else
+                        {
                                 CKEDITOR.fireOnce( 'scaytReady' );
+                        }                               
 
                         return null;
                 },