Ticket #9129: 9129_2.patch

_source/plugins/selection/plugin.js

@@ -81 +81 @@
                 function singletonBlock( node )
                 {
                         var body = range.document.getBody();
-                        return !node.is( 'body' ) && body.getChildCount() == 1;
+
+                        if ( node.isBlockBoundary() &&
+                             range.checkBoundaryOfElement( body, CKEDITOR.START ) &&
+                             range.checkBoundaryOfElement( body, CKEDITOR.END ) )
+                        {
+                                return true;
+                        }
                 }
 
                 var start = range.startContainer,

_source/plugins/wysiwygarea/plugin.js

@@ -767 +767 @@
 
                                                 domDocument.getDocumentElement().addClass( domDocument.$.compatMode );
                                                 // Override keystroke behaviors.
-                                                editable && domDocument.on( 'keydown', function( evt )
+                                                editor.on( 'key', function( evt )
                                                 {
-                                                        var keyCode = evt.data.getKeystroke();
+                                                        var keyCode = evt.data.keyCode;
 
                                                         // Backspace OR Delete.
                                                         if ( keyCode in { 8 : 1, 46 : 1 } )
@@ -799 +799 @@
 
                                                                         editor.fire( 'saveSnapshot' );
 
-                                                                        evt.data.preventDefault();
+                                                                        evt.cancel();
                                                                 }
                                                                 else
                                                                 {
@@ -823 +823 @@
 
                                                                                 editor.fire( 'saveSnapshot' );
 
-                                                                                evt.data.preventDefault();
+                                                                                evt.cancel();
                                                                         }
                                                                         else if ( path.blockLimit.is( 'td' ) &&
                                                                                           ( parent = path.blockLimit.getAscendant( 'table' ) ) &&
@@ -843 +843 @@
 
                                                                                 editor.fire( 'saveSnapshot' );
 
-                                                                                evt.data.preventDefault();
+                                                                                evt.cancel();
                                                                         }
 
                                                                 }
@@ -865 +865 @@
                                                                                 range = new CKEDITOR.dom.range( domDocument );
                                                                                 range[ keyCode == 33 ? 'moveToElementEditStart' : 'moveToElementEditEnd']( body );
                                                                                 range.select();
-                                                                                evt.data.preventDefault();
+                                                                                evt.cancel();
                                                                         }
                                                                 }
 

_source/plugins/list/plugin.js

@@ -973 +973 @@
                                                                 joinNextLineToCursor( editor, cursor, range );
                                                                 evt.cancel();
                                                         }
+                                                        else
+                                                        {
+                                                                var list = path.contains( listNodeNames ), li;
+                                                                // Backspace pressed at the start of list, in first list item. (#9129)
+                                                                if ( list && range.checkBoundaryOfElement( list, CKEDITOR.START ) )
+                                                                {
+                                                                        li = path.contains( CKEDITOR.dtd.$listItem );
+
+                                                                        // Outdent the list item if:
+                                                                        // 1. Inside of empty list item.
+                                                                        // 2. No content to merge before.
+                                                                        if ( range.checkBoundaryOfElement( li, CKEDITOR.START ) )
+                                                                        {
+                                                                                previous = list.getPrevious( nonEmpty );
+                                                                                if ( range.checkBoundaryOfElement( li, CKEDITOR.END ) ||
+                                                                                     !previous ||
+                                                                                     // A special case of "no content to merge before"
+                                                                                     previous.is( 'table' ) )
+                                                                                {
+                                                                                        editor.execCommand( 'outdent' );
+                                                                                        evt.cancel();
+                                                                                }
+                                                                        }
+                                                                }
+                                                        }
                                                 }
                                                 else
                                                 {