Ticket #5546: 5546_2.patch

_source/plugins/scayt/plugin.js

@@ -141 +141 @@
                                         }
                                 }
                         });
-
+                editor.on( 'afterCommandExec', function( ev )
+                        {
+                                
+                                if ( !plugin.isScaytEnabled(editor) )
+                                        return;
+                                
+                                if ( ev.data.name == 'undo' || ev.data.name == 'redo' && editor.mode == 'wysiwyg' ) 
+                                {
+                                        window.setTimeout( function(){ plugin.getScayt( editor ).refresh(); }, 10 );
+                                }
+                                
+                        });
                 editor.on( 'destroy', function( ev )
                         {
                                 var editor = ev.editor,
@@ -220 +231 @@
                                 }
                         );
                 }
+                
+                // Override Image.equals method avoid CK snapshot module to add SCAYT markup to snapshots ( 5546 ticket )
+                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;
+                                var scayt_instance = plugin.getScayt( this.editor );
+                                // Making the comparison based on content without SCAYT word markers.
+                                if ( scayt_instance && plugin.isScaytReady( this.editor ) )
+                                {
+                                        this.contents = scayt_instance.reset( thisContents );
+                                        otherImage.contents = scayt_instance.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();
 
                 // In IE, we need to remove the expando attributes.
                 CKEDITOR.env.ie && contents && ( contents = contents.replace( /\s+_cke_expando=".*?"/g, '' ) );
-
+                
                 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;
@@ -137 +144 @@
         {
                 equals : function( otherImage, contentOnly )
                 {
+                        
                         var thisContents = this.contents,
-                                otherContents = otherImage.contents;
+                                otherContents = otherImage.contents,
+                                // Registered filters makes Image to respond correct on service markup of SCAYT and any other plugins 
+                                // The editor object is absent in context of Image by default, 
+                                // so for prototyping we use hardcoded editor name "editor1"
+                                thisEqualsFilters = CKEDITOR.instances.editor1._.imageEqualsFilters,
+                                i,err;
 
                         // For IE6/7 : Comparing only the protected attribute values but not the original ones.(#4522)
                         if ( CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat ) )
@@ -146 +159 @@
                                 thisContents = thisContents.replace( protectedAttrs, '' );
                                 otherContents = otherContents.replace( protectedAttrs, '' );
                         }
-
+                        
+                        
+                        // Run custom filters
+                        if (thisEqualsFilters && thisEqualsFilters.length)
+                                for ( i in thisEqualsFilters )
+                                        try{
+                                                filteredContents = thisEqualsFilters[i].apply(null,[thisContents,otherContents]);
+                                                thisContents = filteredContents[0];
+                                                otherContents = filteredContents[1];
+                                        }catch (err){}
+                        
+                                        
                         if ( thisContents != otherContents )
                                 return false;