Ticket #5984: 5984.patch

_source/plugins/wysiwygarea/plugin.js

@@ -225 +225 @@
                         // block, we should revert the fix and move into the existed one. (#3684)
                         if ( isBlankParagraph( fixedBlock ) )
                         {
-                                var previousElement = fixedBlock.getPrevious( isNotWhitespace ),
-                                        nextElement = fixedBlock.getNext( isNotWhitespace );
-
-                                if ( previousElement && previousElement.getName
-                                         && !( previousElement.getName() in nonExitableElementNames )
-                                         && isBlankParagraph( previousElement )
-                                         && range.moveToElementEditStart( previousElement )
-                                         || nextElement && nextElement.getName
-                                                && !( nextElement.getName() in nonExitableElementNames )
-                                                && isBlankParagraph( nextElement )
-                                                && range.moveToElementEditStart( nextElement ) )
+                                var element = fixedBlock.getNext( isNotWhitespace );
+                                if ( element && 
+                                         element.type == CKEDITOR.NODE_ELEMENT && 
+                                         !nonExitableElementNames[ element.getName() ] )
                                 {
+                                        range.moveToElementEditStart( element );
                                         fixedBlock.remove();
                                 }
+                                else
+                                {
+                                        element = fixedBlock.getPrevious( isNotWhitespace );
+                                        if ( element && 
+                                                 element.type == CKEDITOR.NODE_ELEMENT && 
+                                                 !nonExitableElementNames[ element.getName() ] )
+                                        {
+                                                range.moveToElementEditEnd( element );
+                                                fixedBlock.remove();
+                                        }
+                                }
                         }
 
                         range.select();