Ticket #3730: 3730.patch

_source/plugins/domiterator/plugin.js

@@ -19 +19 @@
 
                 this.range = range;
                 this.forceBrBreak = false;
+
+                // Whether include <br>s into the enlarged range.(#3730).
+                this.enlargeBr = true;
                 this.enforceRealBlocks = false;
 
                 this._ || ( this._ = {} );
@@ -45 +48 @@
                         if ( !this._.lastNode )
                         {
                                 range = this.range.clone();
-                                range.enlarge( this.forceBrBreak ? CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
+                                range.enlarge( this.forceBrBreak || !this.enlargeBr ?
+                                                           CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
                                 var walker = new CKEDITOR.dom.walker( range ),
                                         ignoreBookmarkTextEvaluator = CKEDITOR.dom.walker.bookmark( true, true );
@@ -241 +245 @@
                                         // If the range doesn't includes the entire contents of the
                                         // block, we must split it, isolating the range in a dedicated
                                         // block.
-                                        if ( !range.checkStartOfBlock() || !range.checkEndOfBlock() )
+                                        if ( this.enlargeBr && !( range.checkStartOfBlock() && range.checkEndOfBlock() ) )
                                         {
                                                 // The resulting block will be a clone of the current one.
                                                 block = block.clone( false );

_source/plugins/indent/plugin.js

@@ -153 +153 @@
 
         function indentBlock( editor, range )
         {
-                var iterator = range.createIterator();
+                var iterator = range.createIterator(),
+                        enterMode = editor.config.enterMode;
                 iterator.enforceRealBlocks = true;
-
+                iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
                 var block;
-                while ( ( block = iterator.getNextParagraph() ) )
-                {
 
+                // Use 'div' as default grouping tag for multiple lines breaked by <br>. 
+                while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_BR ? 'div' : 'p' ) ) )
+                {
                         if ( this.useIndentClasses )
                         {
                                 // Transform current class name to indent step index.