Ticket #5546: 5546.patch

_source/plugins/scayt/plugin.js

@@ -133 +133 @@
                                         }
                                 }
                         });
-
+                editor.on( 'afterCommandExec', function( ev )
+                        {
+                                
+                                if ( !plugin.isScaytEnabled(editor) )
+                                        return;
+                                        
+                                if ( ev.data.name == 'undo' || ev.data.name == 'redo' && editor.mode == 'wysiwyg' ) 
+                                {
+                                        var scayt_instance = plugin.getScayt( editor );
+                                        window.setTimeout(function(){scayt_instance.refresh()},0);
+                                }
+                        });
                 editor.on( 'destroy', function( ev )
                         {
                                 var editor = ev.editor,
@@ -213 +224 @@
                         );
                 }
 
+                var undoImagePrototype = CKEDITOR.plugins.undo.Image.prototype;
+                undoImagePrototype.equals =      CKEDITOR.tools.override( undoImagePrototype.equals, function( org )
+                {
+                        return function( otherImage )
+                        {
+                                var thisContents = this.contents,
+                                        otherContents = otherImage.contents;
+
+                                // Making the comparison based on content without SCAYT word markers.
+                                this.contents = plugin.getScayt( this.editor ).reset( thisContents );
+                                otherImage.contents = plugin.getScayt( this.editor ).reset( otherContents );
+
+                                var retval = org.apply( this, arguments );
+
+                                this.contents = thisContents;
+                                otherImage.contents = otherContents;
+                                return retval;
+                        }
+                });
+
                 if ( editor.document )
                         createInstance();
         };

_source/plugins/undo/plugin.js

@@ -117 +117 @@
                 }
         });
 
-        // Gets a snapshot image which represent the current document status.
-        function Image( editor )
+        CKEDITOR.plugins.undo = {};
+
+        /**
+         * Undo snapshot which represents the current document status.
+         * @name CKEDITOR.plugins.undo.Image
+         * @param editor The editor instance on which the image is created.
+         */
+        var Image = CKEDITOR.plugins.undo.Image = function( editor )
         {
+                this.editor = editor;
                 var contents    = editor.getSnapshot(),
                         selection       = contents && editor.getSelection();
 
@@ -128 +135 @@
 
                 this.contents   = contents;
                 this.bookmarks  = selection && selection.createBookmarks2( true );
-        }
+        };
 
         // Attributes that browser may changing them when setting via innerHTML.
         var protectedAttrs = /\b(?:href|src|name)="[^"]*?"/gi;