Changeset 3894

Timestamp:

07/14/09 12:46:34 (4 years ago)

Author:

garry.yao

Message:

Fixing #3836: Remove list in enterMode=BR will merge sibling text to one line.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/list/plugin.js (modified) (2 diffs)
• _source/tests/plugins/list/list.html (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -130 +130 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3742">#3742</a> : Fixed wrong dialog layout for dialogs without tab bar in IE RTL mode .</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3671">#3671</a> : Fixed body fixing should be applied to the real type under fake elements.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3836">#3836</a> : Fixed remove list in enterMode=BR will merge sibling text to one line.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/list/plugin.js

@@ -336 +336 @@
 
                 var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode );
+
+                // Compensate a <br> before the first node if the previous node of list is a non-blocks.(#3836) 
+                var docFragment = newList.listNode, firstNode, previousNode;
+                if ( ( firstNode = docFragment.getFirst() )
+                         && !( firstNode.is && firstNode.isBlockBoundary() )
+                         && ( previousNode = groupObj.root.getPrevious( true ) )
+                         && !( previousNode.is && previousNode.isBlockBoundary( { br : 1 } ) ) )
+                        editor.document.createElement( 'br' ).insertBefore( firstNode );
+
                 // If groupObj.root is the last element in its parent, or its nextSibling is a <br>, then we should
                 // not add a <br> after the final item. So, check for the cases and trim the <br>.
@@ -343 +352 @@
                                 newList.listNode.getLast().remove();
                 }
-                newList.listNode.replace( groupObj.root );
+                docFragment.replace( groupObj.root );
         }
 

CKEditor/trunk/_source/tests/plugins/list/list.html

@@ -162 +162 @@
                         },
 
+                        /**
+                         *  Test remove list first list item not merging with previous text node.
+                         */
+                        test_ticket_3836 : function()
+                        {
+                                prepareEditor( 'test_ticket_3836_editor', null,
+                                        { enterMode : CKEDITOR.ENTER_BR },
+                                        function( editor )
+                                        {
+                                                this.resume( function()
+                                                {
+                                                        editor.focus();
+
+                                                        var doc = editor.document,
+                                                                range = new CKEDITOR.dom.range( doc );
+                                                        setRange( range, [ 1, 1, 0, 0 ], [ 1, 1, 1, 1 ] );
+                                                        debugger;
+                                                        var sel = editor.getSelection();
+                                                        sel.selectRanges( [ range ] );
+
+                                                        // Waiting for 'comand state' effected.
+                                                        this.wait( function(){
+                                                                // Remove list.
+                                                                editor.execCommand( 'bulletedlist' );
+                                                                assert.areSame( getTextAreaValue( 'test_ticket_3836_result' ),
+                                                                        editor.getData(),
+                                                                        'Remove list result not correct.' );
+                                                        }, 1000 );
+
+                                                } );
+                                        }, this );
+                                        this.wait();
+                        },
+
                         name :document.title
                 };
@@ -175 +209 @@
 <textarea id="test_ticket_3773_editor"><ol><li>line1</li><li>line2</li></ol></textarea>
 <textarea id="test_ticket_3773_result">line1<br />line2</textarea>
+<textarea id="test_ticket_3836_editor">line1<ul><li>item1</li><li>item2</li></ul>line2</textarea>
+<textarea id="test_ticket_3836_result">line1<br />item1<br />item2<br />line2</textarea>
 </body>
 </html>