Ticket #9161: 4688.2.patch

_source/plugins/scayt/plugin.js

@@ -61 +61 @@
 
                                 };
 
-                        oParams.onBeforeChange = function()
-                        {
-                                if ( plugin.getScayt( editor ) && !editor.checkDirty() )
-                                        setTimeout( function(){ editor.resetDirty(); }, 0 );
-                        };
-
                         var scayt_custom_params = window.scayt_custom_params;
                         if ( typeof scayt_custom_params == 'object' )
                         {
@@ -131 +125 @@
                                                 plugin.setPaused( editor, !scayt_instance.disabled );
                                                 // store a control id for restore a specific scayt control settings
                                                 plugin.setControlId( editor, scayt_instance.id );
+                                                //remove SCAYT markup from editor._.previousValue before SCAYT destroy
+                                                editor._.previousValue = scayt_instance.reset( editor._.previousValue );
                                                 scayt_instance.destroy( true );
                                                 delete plugin.instances[ editor.name ];
                                         }
@@ -272 +268 @@
                         };
                 });
 
+                var editorCheckDirty = CKEDITOR.editor.prototype;
+                
+                // Override editor.checkDirty method avoid CK checkDirty functionality to fix SCAYT issues with incorrect checkDirty behavior.
+                editorCheckDirty.checkDirty = CKEDITOR.tools.override(editorCheckDirty.checkDirty, function( org )
+                        {
+                                return function()
+                                {
+                                        var retval = null,
+                                        scayt_instance = plugin.getScayt( editor );
+                                         
+                                        if ( scayt_instance && plugin.isScaytReady( editor ) )
+                                        {               
+                                                // save property state
+                                                var saveGetSnapshot = editor.getSnapshot,
+                                                        savePreviousValue = editor._.previousValue;
+                                                
+                                                // override property state
+                                                editor.getSnapshot = function()
+                                                {
+                                                        return scayt_instance.reset( saveGetSnapshot.apply( this, arguments ) );
+                                                }
+                                                
+                                                editor._.previousValue = scayt_instance.reset(editor._.previousValue);
+
+                                                // run real checkDirty method
+                                                retval = org.apply( this, arguments );
+                                                
+                                                // restore changed property
+                                                editor.getSnapshot = saveGetSnapshot;
+                                                editor._.previousValue = savePreviousValue;
+                                        }
+                                        else
+                                        {
+                                                retval = org.apply(this);
+                                        }
+                                        
+                                        return retval;
+                                }
+                        });
+
                 if ( editor.document )
                         createInstance();
         };