Changeset 7392 for CKEditor/trunk

Timestamp:

03/16/12 08:26:52 (14 months ago)

Author:

garry.yao

Message:

#8249

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/core/dom/range.js (modified) (1 diff)
• _source/plugins/indent/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -63 +63 @@
                 <li><a href="http://dev.ckeditor.com/ticket/5527">#5527</a> : Don't encode "#" sent from the file browser.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/8014">#8014</a> : Autogrow now stretches to fit the content when switching editor modes.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/8249">#8249</a> : Fix inconsistent behavior when backspace key at the start of list item.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/core/dom/range.js

@@ -386 +386 @@
         {
                 // Reject any text node unless it's being bookmark
-                // OR it's spaces. (#3883)
-                return node.type != CKEDITOR.NODE_TEXT
-                            && node.getName() in CKEDITOR.dtd.$removeEmpty
-                            || !CKEDITOR.tools.trim( node.getText() )
-                            || !!node.getParent().data( 'cke-bookmark' );
+                // OR it's spaces.
+                // Reject any element unless it's being invisible empty. (#3883)
+                return node.type == CKEDITOR.NODE_TEXT ?
+                           !CKEDITOR.tools.trim( node.getText() ) ||
+                           !!node.getParent().data( 'cke-bookmark' )
+                           : node.getName() in CKEDITOR.dtd.$removeEmpty;
         }
 

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

@@ -426 +426 @@
                                 }
                         });
+
+                        editor.on( 'key', function( evt )
+                        {
+                                // Backspace at the beginning of  list item should outdent it.
+                                if ( editor.mode == 'wysiwyg' && evt.data.keyCode == 8 )
+                                {
+                                        var sel = editor.getSelection(),
+                                                range = sel.getRanges()[ 0 ],
+                                                li;
+
+                                        if ( range.collapsed &&
+                                                 ( li = range.startContainer.getAscendant( 'li', 1 ) ) &&
+                                                 range.checkBoundaryOfElement( li, CKEDITOR.START ) )
+                                        {
+                                                editor.execCommand( 'outdent' );
+                                                evt.cancel();
+                                        }
+                                }
+                        });
                 },