Ticket #4073: 4073.patch

_test/dt/core/dom/range.html

@@ -1062 +1067 @@
                  */
                 test_enlarge_block6 : function()
                 {
-                        var range = getRange( 'S11', null );
+                        var range = getRange( 'S11' );
                         range.enlarge( CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS );
 
                         assert.areSame( document.getElementById( '_EnlargeP17' ),
@@ -1070 +1075 @@
                         assert.areSame( 0, range.startOffset, 'range.startOffset' );
                 },
 
+                /**
+                 * Test enlarge block when there's no nodes to enlarge.
+                 */
+                test_enlarge_block7 : function()
+                {
+                        var range = getRange( 'S12' );
+                        range.enlarge( CKEDITOR.ENLARGE_BLOCK_CONTENTS );
+                        var frag = range.extractContents(),
+                                tmp = new CKEDITOR.dom.element( 'div' );
+                        tmp.append( frag );
+                        assert.areSame( '<span>test block</span>', CKEDITOR.test.getInnerHtml( tmp ) );
+                },
+
                 test_deleteContents_W3C_1 : function()
                 {
                         // W3C DOM Range Specs - Section 2.6 - Example 1
@@ -2385 +2403 @@
                 <p id="_EnlargeP4">Test <i id="_EnlargeI4"> Enlarge</i></p>
                 <p id="_EnlargeP5">Test <i id="_EnlargeI5">Enlarge</i></p>
                 <p id="_EnlargeP6">Test <i id="_EnlargeI6"><b></b>Enlarge</i></p>
-                <p id="_EnlargeP7">Test <span id="S1"></span>List<br/ >Item Enlarge</p>
+                <p id="_EnlargeP7">Test <span id="S1"></span>List<br />Item Enlarge</p>
                 <p id="_EnlargeP8">Test <span id="S2"></span>List<span id="E2"></span> <br /><br />Item Enlarge</p>
                 <p id="_EnlargeP9">Test List <br /><span id="S3"></span><br />Item Enlarge</p>
                 <p id="_EnlargeP10">Test List <br /><br />Item<span id="S4"></span> Enlarge</p>
@@ -2393 +2411 @@
                 <div id="_EnlargeP12">Test<span id="S6"></span> Block <div>Enlarge</div></div>
                 <div>Test <div id="_EnlargeP13">Blo<span id="S7"></span>ck</div> Enlarge</div>
                 <p id="_EnlargeP14"><span id="S8"></span></p>
-                <p id="_EnlargeP15">Test <span id="S9"></span>List<br/ >Item Enlarge</p>
+                <p id="_EnlargeP15">Test <span id="S9"></span>List<br />Item Enlarge</p>
                 <p id="_EnlargeP16">Test <strong>Block<span id="S10"></span></strong><br /><br />Enlarge</p>
-                <p id="_EnlargeP17"><span><span id="S11"></span>Test Block Enlarge<span id="E11"></span></span></p>
+                <p id="_EnlargeP17"><span><span id="S11"></span>Test Block Enlarge</span></p>
+                <div id="_EnlargeP18"><span>Test Block</span><span id="S12"></span><p> Enlarge</p></div>
                 <p id="_trim_ct">Test trim</p>
         </div>
         <script type="text/javascript">

_source/core/dom/range.js

@@ -1173 +1173 @@
 
                                         walker.guard = boundaryGuard;
 
-                                        enlargeable = walker.lastBackward();
+                                        // Take the range end container if there's no
+                                        // nodes to enlarge( #4073 ).
+                                        enlargeable = walker.lastBackward() || walkerRange.endContainer;
 
                                         // It's the body which stop the enlarging if no block boundary found.
                                         blockBoundary = blockBoundary || body;
 
                                         // Start the range at different position by comparing
                                         // the document position of it with 'enlargeable' node.
-                                        this.setStartAt(
-                                                        blockBoundary,
+                                        this.setStartAt( blockBoundary,
                                                         !blockBoundary.is( 'br' ) &&
-                                                        ( !enlargeable || blockBoundary.contains( enlargeable ) ) ?
+                                                        ( blockBoundary.contains( enlargeable )
+                                                          || blockBoundary.equals( enlargeable ) ) ?
                                                                 CKEDITOR.POSITION_AFTER_START :
                                                                 CKEDITOR.POSITION_AFTER_END );
 
@@ -1199 +1201 @@
                                         blockBoundary = null;
                                         // End the range right before the block boundary node.
 
-                                        enlargeable = walker.lastForward();
+                                        // Take the range start container if there's no
+                                        // nodes to enlarge( #4073 ).
+                                        enlargeable = walker.lastForward() || walkerRange.startContainer;
 
                                         // It's the body which stop the enlarging if no block boundary found.
                                         blockBoundary = blockBoundary || body;
 
                                         // Start the range at different position by comparing
                                         // the document position of it with 'enlargeable' node.
-                                        this.setEndAt(
-                                                        blockBoundary,
+                                        this.setEndAt( blockBoundary,
                                                         !blockBoundary.is( 'br' ) &&
-                                                        ( !enlargeable || blockBoundary.contains( enlargeable ) ) ?
+                                                        ( blockBoundary.contains( enlargeable )
+                                                          || blockBoundary.equals( enlargeable ) ) ?
                                                                 CKEDITOR.POSITION_BEFORE_END :
                                                                 CKEDITOR.POSITION_BEFORE_START );
                                         // We must include the <br> at the end of range if there's