Ticket #6630: 6630.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -193 +193 @@
                                                 delete element.name;
                                 },
 
+                                // Empty <pre> in IE is reported with filler node (&nbsp;).
+                                pre : function( element ) { CKEDITOR.env.ie && trimFillers( element ); },
+
                                 html : function( element )
                                 {
                                         delete element.attributes.contenteditable;

_source/core/dom/element.js

@@ -254 +254 @@
                 },
 
                 /**
+                * Retrieve block element's filler node if existed.
+                */
+           getBogus : function()
+           {
+                   if ( !this.isBlockBoundary() )
+                           return;
+
+                   var lastChild = this.getLast() ;
+
+                   // Ignore empty/spaces text.
+                   while ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT && !CKEDITOR.tools.rtrim( lastChild.getText() ) )
+                           lastChild = lastChild.getPrevious();
+
+                   if ( lastChild &&
+                           ( CKEDITOR.env.ie && lastChild.type == CKEDITOR.NODE_TEXT && CKEDITOR.tools.trim( lastChild.getText() ).match( /^(?: |\xa0)$/ )
+                           ||   CKEDITOR.env.gecko && CKEDITOR.env.webkit && lastChild.is( 'br' ) ) )
+                   {
+                           return lastChild;
+                   }
+           },
+
+                /**
                  * Breaks one of the ancestor element in the element position, moving
                  * this element between the broken parts.
                  * @param {CKEDITOR.dom.element} parent The anscestor element to get broken.

_source/plugins/styles/plugin.js

@@ -1025 +1025 @@
          */
         function toPre( block, newBlock )
         {
+                var bogus = block.getBogus();
+                bogus && bogus.remove();
+
                 // First trim the block content.
                 var preHtml = block.getHtml();