Ticket #3190: 3190_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -114 +114 @@
                                 this.getSelection().lock();
                 }
         }
+        
+        /**
+         * Auto-fixing for block-less paragraph contents on selection change, includes:
+         *  1. Make sure there's always a padding node before document end;
+         *  1. Auto creating wrapping paragraphs when enterMode is block.
+         */
+        function onSelectionChangeFixBody( evt )
+        {
+                var path = evt.data.path,
+                        blockLimit = path.blockLimit,
+                        editor = evt.editor,
+                        body = editor.document.getBody();
+                        
+                // Padding BR if the last element of document is a block.
+                if ( body.getLast().getName() in CKEDITOR.dtd.$block )
+                        body.appendBogus();
+
+                // Establing new paragraph if there's an inline element within body and it's block-less.
+                if ( editor.config.enterMode != CKEDITOR.ENTER_BR
+                         && blockLimit.getName() == 'body' 
+                         && !path.block )
+                {
+                        // Ignore document line-height maintaining 'br's.
+                        var firstBlockless = body.getFirst();
+                        if ( firstBlockless && firstBlockless.getName 
+                                && firstBlockless.getName() == 'br' 
+                                && blockLimit.getChildren().count() == 1 ) 
+                                return;
+
+                        var sel = editor.getSelection(),
+                                ranges = sel.getRanges(),
+                                range = ranges[ 0 ];
+
+                        range.fixBlock( true, 
+                                editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p'  );
+                        sel.selectRanges( ranges );
+                }
+        }
 
         CKEDITOR.plugins.add( 'wysiwygarea',
         {
@@ -420 +458 @@
 
                                         editor.on( 'insertHtml', onInsertHtml, null, null, 20 );
                                         editor.on( 'insertElement', onInsertElement, null, null, 20 );
+                                        // Auto fixing block-less paragraphs. (#3190)
+                                        editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
                                 });
                 }
         });