Ticket #5845: 5845.patch

_source/plugins/wysiwygarea/plugin.js

@@ -14 +14 @@
         var nonExitableElementNames = { table:1,pre:1 };
 
         // Matching an empty paragraph at the end of document.
-        var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
+        var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center|li)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
 
         function onInsertHtml( evt )
         {
@@ -445 +445 @@
                                                         } );
                                                 }
 
+                                                if ( CKEDITOR.env.gecko )
+                                                {
+                                                        domDocument.on( 'mouseup', function( ev )
+                                                        {
+                                                                if ( ev.data.$.button == 2 )
+                                                                {
+                                                                        var target = ev.data.getTarget();
+
+                                                                        // Prevent right click from selecting an empty block even
+                                                                        // when selection is anchored inside it. (#5845) 
+                                                                        if ( !target.getOuterHtml().replace( emptyParagraphRegexp, '' ) )
+                                                                        {
+                                                                                var range = new CKEDITOR.dom.range( domDocument );
+                                                                                range.moveToElementEditStart( target );
+                                                                                range.select( true );
+                                                                        }
+                                                                }
+                                                        } );
+                                                }
+
                                                 // Webkit: avoid from editing form control elements content.
                                                 if ( CKEDITOR.env.webkit )
                                                 {