Ticket #5479: 5479_7.patch

_source/plugins/elementspath/plugin.js

@@ -179 +179 @@
 
                                                 if ( name == 'body' )
                                                         break;
+                                                else if ( name == 'html' )
+                                                        return;
 
                                                 element = element.getParent();
                                         }

_source/plugins/wysiwygarea/plugin.js

@@ -359 +359 @@
 
                 CKEDITOR.env.gecko && activateEditing( editor );
 
+                if ( CKEDITOR.env.ie )
+                {
+                        var start = range.collapsed && range.startContainer;
+                        if ( start.type == CKEDITOR.NODE_ELEMENT && start.is( 'span') && start.data( 'cke-bogus') )
+                        {
+                                range.moveToPosition( start, CKEDITOR.POSITION_BEFORE_START );
+                                start.remove();
+                                range.select();
+                                return;
+                        }
+                }
+
                 // When enterMode set to block, we'll establing new paragraph only if we're
                 // selecting inline contents right under body. (#3657)
                 if ( enterMode != CKEDITOR.ENTER_BR
@@ -410 +422 @@
                         if ( !CKEDITOR.env.ie )
                                 editor.selectionChange();
                 }
-
-                // All browsers are incapable to moving cursor out of certain non-exitable
-                // blocks (e.g. table, list, pre) at the end of document, make this happen by
-                // place a bogus node there, which would be later removed by dataprocessor.
-                var walkerRange = new CKEDITOR.dom.range( editor.document ),
-                        walker = new CKEDITOR.dom.walker( walkerRange );
-                walkerRange.selectNodeContents( body );
-                walker.evaluator = function( node )
-                {
-                        return node.type == CKEDITOR.NODE_ELEMENT && ( node.getName() in nonExitableElementNames );
-                };
-                walker.guard = function( node, isMoveout )
-                {
-                        return !( ( node.type == CKEDITOR.NODE_TEXT && isNotWhitespace( node ) ) || isMoveout );
-                };
-
-                if ( walker.previous() )
-                {
-                        editor.fire( 'updateSnapshot' );
-                        restoreDirty( editor );
-                        CKEDITOR.env.ie && restoreSelection( selection );
-
-                        var paddingBlock;
-                        if ( enterMode != CKEDITOR.ENTER_BR )
-                                paddingBlock = body.append( new CKEDITOR.dom.element( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) );
-                        else
-                                paddingBlock = body;
-
-                        if ( !CKEDITOR.env.ie )
-                                paddingBlock.appendBogus();
-                }
-        }
+        }
 
         CKEDITOR.plugins.add( 'wysiwygarea',
         {
@@ -686 +667 @@
                                                         } );
                                                 }
 
+                                                // In certain situation when browsers are incapable to moving cursor out of certain non-exitable
+                                                // blocks (e.g. table, list, pre) at the end of document, make this happen by
+                                                // placing a padding area, when clicked put cursor at the end of body.
+                                                var htmlElement = domDocument.getDocumentElement(),
+                                                        body = domDocument.getBody(),
+                                                        nonWhiteSpaces = CKEDITOR.dom.walker.whitespaces( 1 ),
+                                                        bodyPad = htmlElement.append( 'div' );
+                                                bodyPad.setAttribute( 'contentEditable', false );
+                                                bodyPad.addClass( 'cke_body_pad' );
+                                                bodyPad.setStyles( { width : '100%', height : '1em' } );
+                                                bodyPad.on( 'click', function()
+                                                {
+                                                        var last = body.getLast( nonWhiteSpaces );
+                                                        if ( last.type == CKEDITOR.NODE_TEXT || !nonExitable( last ) )
+                                                                return;
+
+                                                        if ( !CKEDITOR.env.ie )
+                                                                body.appendBogus();
+                                                        else
+                                                        {
+                                                                // IE need at least a node to show the cursor, make it
+                                                                // as <span><br /></span> to capture selection change
+                                                                // event.
+                                                                var paddingNode = CKEDITOR.dom.element.createFromHtml( '<span data-cke-bogus=1>' +
+                                                                        '<br data-cke-temp=1 style="line-height:0"/></span>', domDocument );
+
+                                                                body.append( paddingNode );
+                                                        }
+
+                                                        var range = new CKEDITOR.dom.range( domDocument );
+                                                        range.moveToPosition( body, CKEDITOR.POSITION_BEFORE_END );
+                                                        range.select();
+                                                });
+
+
                                                 // IE standard compliant in editing frame doesn't focus the editor when
                                                 // clicking outside actual content, manually apply the focus. (#1659)
                                                 if ( CKEDITOR.env.ie
@@ -699 +715 @@
                                                                 // Setting focus directly on editor doesn't work, we
                                                                 // have to use here a temporary element to 'redirect'
                                                                 // the focus.
-                                                                if ( evt.data.getTarget().equals( htmlElement ) )
+                                                                if ( !evt.data.getTarget().getAscendant( 'body' ) )
                                                                 {
                                                                         if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
                                                                                 blinkCursor();
@@ -1163 +1179 @@
                                 }
                         });
 
-                }
-        });
+                        var dataProcessor = editor.dataProcessor,
+                                htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+                        htmlFilter && htmlFilter.addRules(
+                        {
+                                elements :
+                                {
+                                        div : function( element )
+                                        {
+                                                var attributes = element.attributes;
+                                                if ( attributes[ 'class' ] == 'cke_body_pad' )
+                                                        return false;
+                                        }
+                                }
+                        });
+                }
+        });
 
         // Fixing Firefox 'Back-Forward Cache' break design mode. (#4514)
         if ( CKEDITOR.env.gecko )