Ticket #6554: 6554_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -18 +18 @@
 
         var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true );
 
+        // Elements that could have empty new line around, including table, pre-formatted block, hr, page-break. (#6554)
+        function nonExitable( element )
+        {
+                return ( element.getName() in nonExitableElementNames )
+                                || element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ];
+        }
+
         function checkReadOnly( selection )
         {
                 if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )
@@ -317 +324 @@
                                 var element = fixedBlock.getNext( isNotWhitespace );
                                 if ( element &&
                                          element.type == CKEDITOR.NODE_ELEMENT &&
-                                         !nonExitableElementNames[ element.getName() ] )
+                                         !nonExitable( element ) )
                                 {
                                         range.moveToElementEditStart( element );
                                         fixedBlock.remove();
@@ -327 +334 @@
                                         element = fixedBlock.getPrevious( isNotWhitespace );
                                         if ( element &&
                                                  element.type == CKEDITOR.NODE_ELEMENT &&
-                                                 !nonExitableElementNames[ element.getName() ] )
+                                                 !nonExitable( element ) )
                                         {
                                                 range.moveToElementEditEnd( element );
                                                 fixedBlock.remove();