Ticket #6841: 6841.patch

_source/plugins/enterkey/plugin.js

@@ -31 +31 @@
 
                         var doc = range.document;
 
-                        // Exit the list when we're inside an empty list item block. (#5376)
-                        if ( range.checkStartOfBlock() && range.checkEndOfBlock() )
-                        {
-                                var path = new CKEDITOR.dom.elementPath( range.startContainer ),
-                                                block = path.block;
+                        var atBlockStart = range.checkStartOfBlock(),
+                                atBlockEnd = range.checkEndOfBlock(),
+                                path = new CKEDITOR.dom.elementPath( range.startContainer ),
+                                block = path.block;
 
+                        // Exit the list when we're inside an empty list item block. (#5376)
+                        if ( atBlockStart && atBlockEnd )
+                        {
                                 if ( block && ( block.is( 'li' ) || block.getParent().is( 'li' ) ) )
                                 {
                                         editor.execCommand( 'outdent' );
                                         return;
                                 }
                         }
+                        // Don't split <pre> if we're in the middle of it, act as shift enter key.
+                        else if ( !atBlockEnd && block.is( 'pre' ) )
+                                return enterBr( editor, mode, range, forceMode );
 
                         // Determine the block element to be used.
                         var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' );
@@ -106 +111 @@
                                         // Do not enter this block if it's a header tag, or we are in
                                         // a Shift+Enter (#77). Create a new block element instead
                                         // (later in the code).
-                                        if ( previousBlock.is( 'li' ) || !headerTagRegex.test( previousBlock.getName() ) )
+                                        if ( previousBlock.is( 'li' ) ||
+                                                        ! ( headerTagRegex.test( previousBlock.getName() ) || previousBlock.is( 'pre' ) ) )
                                         {
                                                 // Otherwise, duplicate the previous block.
                                                 newBlock = previousBlock.clone();
@@ -328 +334 @@
                 // On SHIFT+ENTER:
                 // 1. We want to enforce the mode to be respected, instead
                 // of cloning the current block. (#77)
-                // 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, 1 );
+                return enter( editor, editor.config.shiftEnterMode, 1 );
         }
 
         function enter( editor, mode, forceMode )
@@ -353 +352 @@
                 setTimeout( function()
                         {
                                 editor.fire( 'saveSnapshot' );  // Save undo step.
-                                if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', 1 ) )
+                                if ( mode == CKEDITOR.ENTER_BR )
                                         enterBr( editor, mode, null, forceMode );
                                 else
                                         enterBlock( editor, mode, null, forceMode );

_source/core/dom/range.js

@@ -278 +278 @@
                         if ( node.type == CKEDITOR.NODE_TEXT )
                         {
                                 // If there's any visible text, then we're not at the start.
-                                if ( CKEDITOR.tools.trim( node.getText() ).length )
+                                if ( node.hasAscendant( 'pre' ) || CKEDITOR.tools.trim( node.getText() ).length )
                                         return false;
-                                }
+                        }
                         else if ( node.type == CKEDITOR.NODE_ELEMENT )
                         {
                                 // If there are non-empty inline elements (e.g. <img />), then we're not