Ticket #3509: 3509_5.patch

_source/plugins/wysiwygarea/plugin.js

@@ -156 +156 @@
                 }
         }
 
+        function onSelectionChangeFixEOL( editor )
+        {
+                var range = editor.getSelection().getRanges()[0];
+                if ( range.collapsed && editor.config.enterMode != CKEDITOR.ENTER_BR && range.startContainer.type == CKEDITOR.NODE_ELEMENT)
+                {
+                        // If the current node is not a BR, kick out
+                        var startNode = range.startContainer.getChild( range.startOffset );
+                        if ( !startNode || startNode.type != CKEDITOR.NODE_ELEMENT || !startNode.is( 'br' ) )
+                                return;
+                                
+                        var curElem = range.getBoundaryNodes().startNode,
+                                prevElem;
+                        var startPath = new CKEDITOR.dom.elementPath( curElem );
+                        while ( true )
+                        {
+                                if ( !curElem || curElem.type == CKEDITOR.NODE_TEXT )
+                                        break;
+
+                                if ( ( startPath.blockLimit.getPosition( curElem ) & CKEDITOR.POSITION_CONTAINS ) == 0 )
+                                        return;
+
+                                prevElem = curElem;
+                                curElem = curElem.getPreviousSourceNode( false );
+                        }
+
+                        if ( prevElem )
+                        {
+                                range.moveToPosition( prevElem, CKEDITOR.POSITION_BEFORE_END );
+                                editor.getSelection().selectRanges( [ range ] );
+                                // Force a selection update to update the styles buttons.
+                                editor.forceNextSelectionCheck();
+                                editor.selectionChange();
+                        }
+                }
+        }
+
         CKEDITOR.plugins.add( 'wysiwygarea',
         {
                 requires : [ 'editingblock' ],
@@ -492 +528 @@
                                         editor.on( 'insertElement', onInsertElement, null, null, 20 );
                                         // Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
                                         editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
+                                        editor.on( 'selectionChange', function( event )
+                                                {
+                                                        onSelectionChangeFixEOL(event.editor);
+                                                }, null, null, 1 );
                                 });
                 }
         });