Ticket #9129: 9129_3.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
+                                                                else if ( range.collapsed )
                                                                 {
                                                                         // Handle the following special cases: (#6217)
                                                                         // 1. Del/Backspace key before/after table;
@@ -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

@@ -784 +784 @@
                            CKEDITOR.dtd[ node.getName() ][ '#' ];
         }
 
-        // Merge the visual line content at the cursor range into the block.
+        // Join visually two block lines.
         function joinNextLineToCursor( editor, cursor, nextCursor )
         {
                 editor.fire( 'saveSnapshot' );
@@ -798 +798 @@
 
                 // Kill original bogus;
                 var currentPath = new CKEDITOR.dom.elementPath( cursor.startContainer );
-                var currentLi = currentPath.lastElement.getAscendant( 'li', 1 );
+                var currentBlock = currentPath.lastElement.getAscendant( 'li', 1 ) || currentPath.block;
 
                 var bogus = currentPath.block.getBogus();
                 bogus && bogus.remove();
@@ -815 +815 @@
                 else
                         cursor.startContainer.append( frag );
 
-                var nextPath = new CKEDITOR.dom.elementPath( nextCursor.startContainer );
-                var nextLi = nextCursor.startContainer.getAscendant( 'li', 1 );
+                var nextPath = new CKEDITOR.dom.elementPath( nextCursor.startContainer ),
+                        nextLi = nextCursor.startContainer.getAscendant( 'li', 1 );
 
                 // Move the sub list nested in the next list item.
                 if ( nextLi )
@@ -825 +825 @@
                         if ( sublist )
                         {
                                 // If next line is in the sub list of the current list item.
-                                if ( currentLi.contains( nextLi ) )
+                                if ( currentBlock.contains( nextLi ) )
                                 {
                                         mergeChildren( sublist, nextLi.getParent(), nextLi );
                                         sublist.remove();
                                 }
                                 // Migrate the sub list to current list item.
                                 else
-                                        currentLi.append( sublist );
+                                        currentBlock.append( sublist );
                         }
                 }
 
@@ -918 +918 @@
                                                 if ( !range.collapsed )
                                                         return;
 
+                                                var path = new CKEDITOR.dom.elementPath( range.startContainer );
                                                 var isBackspace = key == 8;
                                                 var body = editor.document.getBody();
                                                 var walker = new CKEDITOR.dom.walker( range.clone() );
                                                 walker.evaluator = function( node ) { return nonEmpty( node ) && !blockBogus( node ); };
+                                                walker.guard = function( node, isOut ) { return !( isOut && node.type == CKEDITOR.NODE_ELEMENT && node.is( 'table' ) ) };
 
                                                 var cursor = range.clone();
 
@@ -929 +931 @@
                                                 {
                                                         var previous, joinWith;
 
-                                                        var path = new CKEDITOR.dom.elementPath( range.startContainer );
-
                                                         // Join a sub list's first line, with the previous visual line in parent.
                                                         if ( ( previous = path.contains( listNodeNames ) ) &&
                                                              range.checkBoundaryOfElement( previous, CKEDITOR.START ) &&
@@ -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 = list.getFirst( nonEmpty );
+
+                                                                        // 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 );
+
+                                                                                // Simply move backward one character when:
+                                                                                // 1. The list item contains a sub list;
+                                                                                // 2. The previous one is a table;
+                                                                                if ( getSubList( li ) ||
+                                                                                     previous && previous.type == CKEDITOR.NODE_ELEMENT &&
+                                                                                     previous.is( 'table' ) )
+                                                                                {
+                                                                                        if ( previous ) {
+                                                                                                range.moveToElementEditEnd( previous );
+                                                                                                range.select();
+                                                                                        }
+
+                                                                                        evt.cancel();
+                                                                                }
+                                                                                // Outdent the list item when:
+                                                                                // 1. Empty list item that contains no sub list.
+                                                                                // 2. No previous content to merge.
+                                                                                else if ( range.checkBoundaryOfElement( li, CKEDITOR.END ) || !previous ) {
+                                                                                        editor.execCommand( 'outdent' );
+                                                                                        evt.cancel();
+                                                                                }
+                                                                        }
+                                                                }
+                                                        }
+                                                }
                                                 else
                                                 {
-                                                        var li = range.startContainer.getAscendant( 'li', 1 );
+                                                        var next,
+                                                                nextLine,
+                                                                li = range.startContainer.getAscendant( 'li', 1 );
+
                                                         if ( li )
                                                         {
                                                                 walker.range.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
@@ -1007 +1049 @@
                                                                 if ( isAtEnd && next )
                                                                 {
                                                                         // Put cursor range there.
-                                                                        var nextLine = range.clone();
+                                                                        nextLine = range.clone();
                                                                         nextLine.moveToElementEditStart( next );
 
                                                                         joinNextLineToCursor( editor, cursor, nextLine );
                                                                         evt.cancel();
+                                                                }
+                                                        }
+                                                        else
+                                                        {
+                                                                // Handle Del key pressed before the list.
+                                                                walker.range.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
+                                                                next = walker.next();
+
+                                                                if ( next && next.type == CKEDITOR.NODE_ELEMENT &&
+                                                                     next.getName() in listNodeNames )
+                                                                {
+                                                                        // The start <li>
+                                                                        next = next.getFirst( nonEmpty );
+
+                                                                        // Move the cursor one character forward if
+                                                                        // the subsequent list item contains sub list.
+                                                                        if ( getSubList( next )  )
+                                                                        {
+                                                                                range.moveToElementEditStart( next );
+                                                                                range.select();
+                                                                                evt.cancel();
+                                                                        }
+                                                                        // Simply remove the current empty block, move cursor to the
+                                                                        // subsequent list.
+                                                                        else if ( path.block &&
+                                                                             range.checkStartOfBlock() &&
+                                                                             range.checkEndOfBlock() )
+                                                                        {
+                                                                                path.block.remove();
+                                                                                range.moveToElementEditStart( next );
+                                                                                range.select();
+                                                                                evt.cancel();
+                                                                        }
                                                                 }
                                                         }
                                                 }