Ticket #5479: 5479_16.patch

_source/plugins/selection/plugin.js

@@ -99 +99 @@
                 canUndo : false
         };
 
-        function createFillingChar( doc )
+        function createFillingChar( range )
         {
+                var doc = range.document;
                 removeFillingChar( doc );
 
+                // Append a zero-width space so WebKit will not try to
+                // move the selection by itself (#1272).
                 var fillingChar = doc.createText( '\u200B' );
                 doc.setCustomData( 'cke-fillingChar', fillingChar );
 
-                return fillingChar;
-        }
+                range.insertNode( fillingChar );
+
+                var next = fillingChar.getNext();
+
+                // If the filling char is followed by a <br>, whithout
+                // having something before it, it'll not blink.
+                // Let's remove it in this case.
+                if ( next && !fillingChar.getPrevious() && next.type == CKEDITOR.NODE_ELEMENT && next.getName() == 'br' )
+                {
+                        removeFillingChar( this.document );
+                        range.moveToPosition( next, CKEDITOR.POSITION_BEFORE_START );
+                }
+                else
+                        range.moveToPosition( fillingChar, CKEDITOR.POSITION_AFTER_END );
+        }
 
         function getFillingChar( doc )
         {
@@ -148 +164 @@
                 {
                         // On WebKit only, we need a special "filling" char on some situations
                         // (#1272). Here we set the events that should invalidate that char.
-                        if ( CKEDITOR.env.webkit )
+                        editor.on( 'selectionChange', function()
                         {
-                                editor.on( 'selectionChange', function() { checkFillingChar( editor.document ); } );
-                                editor.on( 'beforeSetMode', function() { removeFillingChar( editor.document ); } );
-                                editor.on( 'key', function( e )
-                                        {
-                                                // Remove the filling char before some keys get
-                                                // executed, so they'll not get blocked by it.
-                                                switch ( e.data.keyCode )
-                                                {
-                                                        case 37 :       // LEFT-ARROW
-                                                        case 39 :       // RIGHT-ARROW
-                                                        case 8 :        // BACKSPACE
-                                                                removeFillingChar( editor.document );
-                                                }
-                                        });
+                                checkFillingChar( editor.document );
+                        } );
+                        editor.on( 'beforeSetMode', function()
+                        {
+                                removeFillingChar( editor.document );
+                        } );
+                        editor.on( 'key', function( e )
+                        {
+                                // Remove the filling char before some keys get
+                                // executed, so they'll not get blocked by it.
+                                switch ( e.data.keyCode )
+                                {
+                                        case 37 :       // LEFT-ARROW
+                                        case 39 :       // RIGHT-ARROW
+                                        case 8 :        // BACKSPACE
+                                                removeFillingChar( editor.document );
+                                }
+                        } );
 
-                                var fillingCharBefore;
-                                function beforeData()
-                                {
-                                        var fillingChar = getFillingChar( editor.document );
-                                        fillingCharBefore = fillingChar && fillingChar.getText();
+                        var fillingCharBefore;
+                        function beforeData()
+                        {
+                                var fillingChar = getFillingChar( editor.document );
+                                fillingCharBefore = fillingChar && fillingChar.getText();
                                         fillingCharBefore && fillingChar.setText( fillingCharBefore.replace( /\u200B/g, '' ) );
-                                }
-                                function afterData()
-                                {
-                                                var fillingChar = getFillingChar( editor.document );
-                                                fillingChar && fillingChar.setText( fillingCharBefore );
-                                }
-                                editor.on( 'beforeUndoImage', beforeData );
-                                editor.on( 'afterUndoImage', afterData );
-                                editor.on( 'beforeGetData', beforeData, null, null, 0 );
-                                editor.on( 'getData', afterData );
-                        }
+                        }
+                        function afterData()
+                        {
+                                var fillingChar = getFillingChar( editor.document );
+                                fillingChar && fillingChar.setText( fillingCharBefore );
+                        }
+                        editor.on( 'beforeUndoImage', beforeData );
+                        editor.on( 'afterUndoImage', afterData );
+                        editor.on( 'beforeGetData', beforeData, null, null, 0 );
+                        editor.on( 'getData', afterData );
 
                         editor.on( 'contentDom', function()
                                 {
@@ -1194 +1213 @@
                  * by clearing up the original selection.
                  * @param {CKEDITOR.dom.range} ranges
                  */
-                selectRanges : function( ranges )
+                selectRanges : function( ranges, forceExpand )
                 {
                         if ( this.isLocked )
                         {
@@ -1217 +1236 @@
                                 }
 
                                 if ( ranges[ 0 ] )
-                                        ranges[ 0 ].select();
+                                        ranges[ 0 ].select( forceExpand );
 
                                 this.reset();
                         }
@@ -1233 +1252 @@
                                 {
                                         sel.removeAllRanges();
                                         // Remove any existing filling char first.
-                                        CKEDITOR.env.webkit && removeFillingChar( this.document );
+                                        removeFillingChar( this.document );
                                 }
 
                                 for ( var i = 0 ; i < ranges.length ; i++ )
@@ -1284 +1303 @@
                                                 startContainer.appendText( '' );
                                         }
 
-                                        if ( range.collapsed && CKEDITOR.env.webkit )
-                                        {
-                                                // Append a zero-width space so WebKit will not try to
-                                                // move the selection by itself (#1272).
-                                                var fillingChar = createFillingChar( this.document );
-                                                range.insertNode( fillingChar ) ;
+                                        if ( range.collapsed && ( forceExpand || CKEDITOR.env.webkit ) )
+                                                createFillingChar( range );
 
-                                                var next = fillingChar.getNext();
-
-                                                // If the filling char is followed by a <br>, whithout
-                                                // having something before it, it'll not blink.
-                                                // Let's remove it in this case.
-                                                if ( next && !fillingChar.getPrevious() && next.type == CKEDITOR.NODE_ELEMENT && next.getName() == 'br' )
-                                                {
-                                                        removeFillingChar( this.document );
-                                                        range.moveToPosition( next, CKEDITOR.POSITION_BEFORE_START );
-                                                }
-                                                else
-                                                        range.moveToPosition( fillingChar, CKEDITOR.POSITION_AFTER_END );
-                                        }
-
                                         nativeRange.setStart( range.startContainer.$, range.startOffset );
 
                                         try
@@ -1394 +1395 @@
                         start.scrollIntoView();
                 }
         };
-})();
 
-( function()
-{
         var notWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),
                         fillerTextRegex = /\ufeff|\u00a0/,
                         nonCells = { table:1,tbody:1,tr:1 };
@@ -1411 +1409 @@
                                 var isStartMarkerAlone;
                                 var dummySpan;
 
+                                 forceExpand && createFillingChar( this );
+
                                 // IE doesn't support selecting the entire table row/cell, move the selection into cells, e.g.
                                 // <table><tbody><tr>[<td>cell</b></td>... => <table><tbody><tr><td>[cell</td>...
                                 if ( this.startContainer.type == CKEDITOR.NODE_ELEMENT && this.startContainer.getName() in nonCells
@@ -1508 +1508 @@
                                 this.document.fire( 'selectionchange' );
                         }
                 :
-                        function()
+                        function( forceExpand )
                         {
-                                this.document.getSelection().selectRanges( [ this ] );
+                                this.document.getSelection().selectRanges( [ this ], forceExpand );
                         };
-} )();
+
+})();

_source/plugins/wysiwygarea/plugin.js

@@ -430 +430 @@
                                 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',
         {
@@ -1216 +1185 @@
                                 }
                         });
 
-                }
-        });
+                        // All browsers are incapable to moving cursor out of certain non-exitable
+                        // blocks (e.g. table, list, pre) at the end of document, enable this when
+                        // user clicks on the padding bottom area of body.
+                        if ( !CKEDITOR.env.ie || CKEDITOR.document.$.documentMode > 7 )
+                        {
+                                editor.addCss( 'body{padding-bottom: 20px;}');
+                                editor.on( 'contentDom', function ()
+                                {
+                                        var doc = editor.document,
+                                                body = doc.getBody();
+
+                                        body.on( 'click', function ( evt )
+                                        {
+                                                evt = evt.data;
+
+                                                // 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.
+                                                if ( ( evt.$.offsetY || evt.$.layerY || evt.$.y  ) > body.$.clientHeight - parseInt( body.getComputedStyle( 'padding-bottom' ) ) )
+                                                {
+                                                        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() )
+                                                        {
+                                                                var range = new CKEDITOR.dom.range( doc );
+                                                                range.moveToPosition( body, CKEDITOR.POSITION_BEFORE_END );
+                                                                range.select( 1 );
+                                                                evt.preventDefault();
+                                                        }
+                                                }
+                                        });
+                                });
+                        }
+                }
+        });
 
         // Fixing Firefox 'Back-Forward Cache' break design mode. (#4514)
         if ( CKEDITOR.env.gecko )