Ticket #5479: 5479_9.patch

_source/plugins/elementspath/plugin.js

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

_source/core/dom/element.js

@@ -234 +234 @@
                                 this.append( new CKEDITOR.dom.text( text ) );
                 },
 
-                appendBogus : function()
-                {
-                        var lastChild = this.getLast() ;
-
-                        // Ignore empty/spaces text.
-                        while ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT && !CKEDITOR.tools.rtrim( lastChild.getText() ) )
-                                lastChild = lastChild.getPrevious();
-                        if ( !lastChild || !lastChild.is || !lastChild.is( 'br' ) )
-                        {
-                                var bogus = CKEDITOR.env.opera ?
-                                                this.getDocument().createText('') :
-                                                this.getDocument().createElement( 'br' );
-
-                                CKEDITOR.env.gecko && bogus.setAttribute( 'type', '_moz' );
-
-                                this.append( bogus );
-                        }
-                },
-
                 /**
                 * Retrieve block element's filler node if existed.
                 */

_source/core/dom/walker.js

@@ -449 +449 @@
                 return false;
         };
 
+        // Append a filler node at the end of an element if not exists.
+        CKEDITOR.dom.element.prototype.appendBogus = function()
+        {
+                var lastChild = this.getLast( fillerEvaluator ) ;
+                if ( !lastChild || !lastChild.is || !lastChild.is( 'br' ) )
+                {
+                        var bogus = CKEDITOR.env.opera ?
+                                        this.getDocument().createText('') :
+                                        this.getDocument().createElement( 'br' );
+
+                        CKEDITOR.env.gecko && bogus.setAttribute( 'type', '_moz' );
+
+                        this.append( bogus );
+                }
+        };
+
+
 })();

_source/plugins/wysiwygarea/plugin.js

@@ -304 +304 @@
                 return block.getOuterHtml().match( emptyParagraphRegexp );
         }
 
-        isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true );
-
         // Gecko need a key event to 'wake up' the editing
         // ability when document is empty.(#3864, #5781)
         function activateEditing( editor )
@@ -359 +357 @@
 
                 CKEDITOR.env.gecko && activateEditing( editor );
 
+                // Remove the padding body node used in IE.
+                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
@@ -396 +407 @@
                                 {
                                         element = fixedBlock.getPrevious( isNotWhitespace );
                                         if ( element &&
-                                                 element.type == CKEDITOR.NODE_ELEMENT &&
-                                                 !nonExitable( element ) )
+                                                 element.type == CKEDITOR.NODE_ELEMENT )
                                         {
-                                                range.moveToElementEditEnd( element );
-                                                fixedBlock.remove();
-                                        }
-                                }
-                        }
+                                                if ( !nonExitable( element ) )
+                                                {
+                                                        range.moveToElementEditEnd( element );
+                                                        fixedBlock.remove();
+                                                }
+                                                else if ( element.getDirection() )
+                                                        fixedBlock.setAttribute( 'dir', element.getDirection() );
+                                        }
+                                }
+                        }
 
                         range.select();
                         // Notify non-IE that selection has changed.
@@ -414 +429 @@
                                 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',
         {
@@ -690 +674 @@
                                                         } );
                                                 }
 
+                                                // 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 a padding node at the end of body. (#5479)
+                                                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 || last.type != CKEDITOR.NODE_ELEMENT || !nonExitable( last ) )
+                                                                return;
+
+                                                        if ( !CKEDITOR.env.ie )
+                                                                body.appendBogus();
+                                                        else
+                                                        {
+                                                                // IE need at least a node to show the cursor, use a zero height br
+                                                                // to fly under the radar, additionally wrap the br element with an extra span ,
+                                                                // so selection change event could be easily captured when cursor move inside of it.
+                                                                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
@@ -703 +721 @@
                                                                 // 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();
@@ -1167 +1185 @@
                                 }
                         });
 
-                }
-        });
+                        var dataProcessor = editor.dataProcessor,
+                                htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+                        htmlFilter && htmlFilter.addRules(
+                        {
+                                elements :
+                                {
+                                        // Remove body pad for full page.
+                                        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 )

_source/plugins/selection/plugin.js

@@ -599 +599 @@
                                                                 return { container : parent, offset : getNodeIndex( child ) };
                                                 }
 
-                                                // All childs are text nodes.
-                                                if ( index == -1 )
+                                                // All childs are text nodes,
+                                                // or to the right hand of test range are all text nodes. (#6992)
+                                                if ( index == -1 || index == siblings.length - 1 && position < 0 )
                                                 {
                                                         // Adapt test range to embrace the entire parent contents.
                                                         testRange.moveToElementText( parent );
@@ -613 +614 @@
 
                                                         siblings = parent.childNodes;
 
-                                                        // Actual range anchor right beside test range at the inner boundary of text node.
+                                                        // Actual range anchor right beside test range at the boundary of text node.
                                                         if ( !distance )
                                                         {
                                                                 child = siblings[ siblings.length - 1 ];
-                                                                return  { container : child, offset : child.nodeValue.length };
+
+                                                                if ( child.nodeType == CKEDITOR.NODE_ELEMENT )
+                                                                        return { container : parent, offset : siblings.length };
+                                                                else
+                                                                        return { container : child, offset : child.nodeValue.length };
                                                         }
 
                                                         // Start the measuring until distance overflows, meanwhile count the text nodes.