Ticket #5402: 5402_2.patch

_source/plugins/enterkey/plugin.js

@@ -292 +292 @@
 
         function shiftEnter( editor )
         {
-                // On SHIFT+ENTER we want to enforce the mode to be respected, instead
+                // Only effective within document.
+                if ( editor.mode != 'wysiwyg' )
+                        return false;
+
+                // On SHIFT+ENTER:
+                // 1. We want to enforce the mode to be respected, instead
                 // of cloning the current block. (#77)
-                return enter( editor, editor.config.shiftEnterMode, true );
+                // 2. Always perform a block break when inside <pre> (#5402).
+                if ( editor.getSelection().getStartElement().hasAscendant( 'pre', true ) )
+                {
+                        setTimeout( function() { enterBlock( editor, editor.config.enterMode, null, true ); }, 0 );
+                        return true;
+                }
+                else
+                        return enter( editor, editor.config.shiftEnterMode, true );
         }
 
         function enter( editor, mode, forceMode )

_source/core/dom/element.js

@@ -1472 +1472 @@
                         this.moveChildren( newNode );
 
                         // Replace the node.
-                        this.$.parentNode.replaceChild( newNode.$, this.$ );
+                        this.getParent() && this.$.parentNode.replaceChild( newNode.$, this.$ );
                         newNode.$._cke_expando = this.$._cke_expando;
                         this.$ = newNode.$;
                 },