Ticket #5375: 5375.patch

_source/core/config.js

@@ -229 +229 @@
          * @type String
          * @example
          */
-        plugins : 'about,a11yhelp,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+        plugins : 'about,a11yhelp,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,del,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
         /**
          * List of additional plugins to be loaded. This is a tool setting which

_source/plugins/del/plugin.js

@@ +1 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+        // TODO: Copied from 'styles' plugin.
+        var blockElements       = { address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1 };
+
+        function isEmptyBlock( block )
+        {
+                var range = new CKEDITOR.dom.range();
+                range.moveToElementEditStart( block );
+                return range.checkStartOfBlock( block ) && range.checkEndOfBlock( block );
+        }
+
+        CKEDITOR.plugins.add( 'del',
+        {
+                requires : [ 'keystrokes' ],
+
+                init : function( editor )
+                {
+                        editor.on( 'key', function( evt )
+                                {
+                                        if ( editor.mode == 'wysiwyg' && evt.data.keyCode == 46 )       // Del
+                                        {
+                                                var range = editor.getSelection().getRanges()[ 0 ],
+                                                        path = new CKEDITOR.dom.elementPath( range.startContainer );
+
+                                                if( CKEDITOR.env.gecko )
+                                                {
+                                                        // When cursor is at the end of one paragraph, Firefox doesn't remove the following block on 'delete' key as expected . (#5375)
+                                                        if( range.collapsed && range.checkEndOfBlock() )
+                                                        {
+                                                                var block = path.block,
+                                                                                nextBlock = block.getNextSourceNode( true, CKEDITOR.NODE_ELEMENT,
+                                                                                function( element, isMovingOut )
+                                                                                {
+                                                                                        return isMovingOut || element.getName() in blockElements;
+                                                                                });
+
+                                                                if( nextBlock && isEmptyBlock( nextBlock ) )
+                                                                {
+                                                                        editor.fire( 'saveSnapshot' );
+                                                                        nextBlock.remove();
+                                                                        editor.fire( 'saveSnapshot' );
+                                                                        evt.cancel();
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                });
+                }
+        });
+})();