Ticket #12177: 0001-Paragraph-in-list-on-shift-enter.patch

plugins/enterkey/plugin.js

@@ -33 +33 @@
                 bookmark = CKEDITOR.dom.walker.bookmark();
 
         CKEDITOR.plugins.enterkey = {
-                enterBlock: function( editor, mode, range, forceMode ) {
+                enterBlock: function( editor, mode, range, forceMode, shiftEnter ) {
                         // Get the range for the current selection.
                         range = range || getRange( editor );
 
@@ -52 +52 @@
                                 atBlockEnd = range.checkEndOfBlock(),
                                 path = editor.elementPath( range.startContainer ),
                                 block = path.block,
+                                liBookmark, p,
 
                                 // Determine the block element to be used.
                                 blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ),
@@ -271 +272 @@
                                 }
                         }
 
+                        // Put <p> into <li> and move the content:
+                        // <li>foo[]</li>  -> <li><p>foo[]</p></li>
+                        if ( shiftEnter && block.is( 'li' ) ) {
+                                liBookmark = range.createBookmark(),
+                                p = new CKEDITOR.dom.element( 'p' );
+
+                                block.moveChildren( p );
+                                block.append( p );
+                                block = p;
+
+                                range.moveToBookmark( liBookmark );
+                        }
+
                         // Split the range.
                         var splitInfo = range.splitBlock( blockTag );
 
@@ -289 +303 @@
                         // If this is a block under a list item, split it as well. (#1647)
                         if ( nextBlock ) {
                                 node = nextBlock.getParent();
-                                if ( node.is( 'li' ) ) {
+                                if ( !shiftEnter && node.is( 'li' ) ) {
                                         nextBlock.breakParent( node );
                                         nextBlock.move( nextBlock.getNext(), 1 );
                                 }
-                        } else if ( previousBlock && ( node = previousBlock.getParent() ) && node.is( 'li' ) ) {
+                        } else if ( previousBlock && ( node = previousBlock.getParent() ) && !shiftEnter && node.is( 'li' ) ) {
                                 previousBlock.breakParent( node );
                                 node = previousBlock.getNext();
                                 range.moveToElementEditStart( node );
@@ -307 +321 @@
                                 // If the next block is an <li> with another list tree as the first
                                 // child, we'll need to append a filler (<br>/NBSP) or the list item
                                 // wouldn't be editable. (#1420)
-                                if ( nextBlock.is( 'li' ) ) {
+                                if ( !shiftEnter && nextBlock.is( 'li' ) ) {
                                         var walkerRange = range.clone();
                                         walkerRange.selectNodeContents( nextBlock );
                                         var walker = new CKEDITOR.dom.walker( walkerRange );
@@ -330 +344 @@
                                         // 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() ) || previousBlock.is( 'pre' ) ) ) {
+                                        if ( ( !shiftEnter && previousBlock.is( 'li' ) ) || !( headerTagRegex.test( previousBlock.getName() ) || previousBlock.is( 'pre' ) ) ) {
                                                 // Otherwise, duplicate the previous block.
                                                 newBlock = previousBlock.clone();
                                         }
@@ -494 +508 @@
                 headerTagRegex = /^h[1-6]$/;
 
         function shiftEnter( editor ) {
+                var mode = editor.activeShiftEnterMode,
+                        path = editor.elementPath();
+
+                if ( path.contains( 'li' ) ) {
+                        mode = CKEDITOR.ENTER_P;
+                }
                 // On SHIFT+ENTER:
                 // 1. We want to enforce the mode to be respected, instead
                 // of cloning the current block. (#77)
-                return enter( editor, editor.activeShiftEnterMode, 1 );
+                return enter( editor, mode, 1, 1 );
         }
 
-        function enter( editor, mode, forceMode ) {
+        function enter( editor, mode, forceMode, shiftEnter ) {
                 forceMode = editor.config.forceEnterMode || forceMode;
 
                 // Only effective within document.
@@ -524 +544 @@
                 if ( mode == CKEDITOR.ENTER_BR )
                         enterBr( editor, mode, null, forceMode );
                 else
-                        enterBlock( editor, mode, null, forceMode );
+                        enterBlock( editor, mode, null, forceMode, shiftEnter );
 
                 editor.fire( 'saveSnapshot' );
         }