Changeset 5341

Timestamp:

04/06/10 19:40:02 (3 years ago)

Author:

garry.yao

Message:

#5465: Allow enterKey to create new list item even in force enter mode when pressing enter at the end of list item.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/enterkey/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -124 +124 @@
                 <li><a href="http://dev.fckeditor.net/ticket/5261">#5261</a> : Config option 'scayt_autoStartup' slow down editor loading.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3846">#3846</a> : Google Chrome - No Img properties after inserting.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/5465">#5465</a> : ShiftEnter=DIV doesn't respect list item when pressing enter at end of list item.</li>
                 <li>Updated the following language files:<ul>
                         <li>Faroese;</li>

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

@@ -101 +101 @@
                                         // a Shift+Enter (#77). Create a new block element instead
                                         // (later in the code).
-                                        if ( !forceMode && !headerTagRegex.test( previousBlock.getName() ) )
+                                        if ( previousBlock.is( 'li' ) ||
+                                                 !( forceMode || headerTagRegex.test( previousBlock.getName() ) ) )
                                         {
                                                 // Otherwise, duplicate the previous block.