Ticket #4125: 4125_6.patch

_source/plugins/removeformat/plugin.js

@@ -15 +15 @@
                                 label : editor.lang.removeFormat,
                                 command : 'removeFormat'
                         });
+
+                editor._.removeFormat = { filters: [] };
         }
 });
 
@@ -32 +34 @@
                                 var removeAttributes = editor._.removeAttributes ||
                                         ( editor._.removeAttributes = editor.config.removeFormatAttributes.split( ',' ) );
 
+                                var filter = CKEDITOR.plugins.removeformat.filter;
                                 var ranges = editor.getSelection().getRanges();
 
                                 for ( var i = 0, range ; range = ranges[ i ] ; i++ )
@@ -70 +73 @@
                                                                 break;
 
                                                         // If this element can be removed (even partially).
-                                                        if ( tagsRegex.test( pathElement.getName() ) )
+                                                        if ( tagsRegex.test( pathElement.getName() ) && filter( editor, pathElement ) )
                                                                 node.breakParent( pathElement );
                                                 }
                                         };
@@ -92 +95 @@
                                                 var nextNode = currentNode.getNextSourceNode( false, CKEDITOR.NODE_ELEMENT );
 
                                                 // This node must not be a fake element.
-                                                if ( !( currentNode.getName() == 'img' && currentNode.getAttribute( '_cke_realelement' ) ) )
+                                                if ( !( currentNode.getName() == 'img'
+                                                        && currentNode.getAttribute( '_cke_realelement' ) )
+                                                        && filter( editor, currentNode ) )
                                                 {
                                                         // Remove elements nodes that match with this style rules.
                                                         if ( tagsRegex.test( currentNode.getName() ) )
@@ -110 +115 @@
                                 editor.getSelection().selectRanges( ranges );
                         }
                 }
-        }
+        },
+
+        filter : function ( editor, element )
+        {
+                var filters = editor._.removeFormat.filters;
+                for ( var i = 0; i < filters.length; i++ )
+                {
+                        if ( filters[ i ]( element ) === false )
+                                return false;
+                }
+                return true;
+        }
 };
 
 /**
+ * Add to a collection of functions to decide whether a specific
+ * element should be considered as formatting element and thus
+ * could be removed during <b>removeFormat</b> command,
+ * Note: Only available with the existence of 'removeformat' plugin.
+ * @since 3.3
+ * @default []
+ * @example
+ *  // Don't remove empty span
+ *  editor.addRemoveFormatFilter.push( function( element )
+ *              {
+ *                      return !( element.is( 'span' ) && CKEDITOR.tools.isEmpty( element.getAttributes() ) );
+ *              });
+ */
+CKEDITOR.editor.prototype.addRemoveFormatFilter = function( func )
+{
+        this._.removeFormat.filters.push( func );
+};
+
+/**
  * A comma separated list of elements to be removed when executing the "remove
  " format" command. Note that only inline elements are allowed.
  * @type String

_source/plugins/scayt/plugin.js

@@ -636 +636 @@
 
                 afterInit : function( editor )
                 {
-                        // Prevent word marker line from displaying in elements path. (#3570)
-                        var elementsPathFilters;
-                        if ( editor._.elementsPath && ( elementsPathFilters = editor._.elementsPath.filters ) )
-                        {
-                                elementsPathFilters.push( function( element )
-                                {
-                                        if ( element.hasAttribute( 'scaytid' ) )
-                                                return false;
-                                } );
-                        }
+                        // Prevent word marker line from displaying in elements path and been removed when cleaning format. (#3570) (#4125)
+                        var elementsPathFilters,
+                                        scaytFilter = function( element )
+                                        {
+                                                if ( element.hasAttribute( 'scaytid' ) )
+                                                        return false;
+                                        };
 
+                        if ( editor._.elementsPath && ( elementsPathFilters = editor._.elementsPath.filters ) )
+                                elementsPathFilters.push( scaytFilter );
+
+                        editor.addRemoveFormatFilter && editor.addRemoveFormatFilter( scaytFilter );
+
                 }
         });
 })();