Ticket #6629: 6629_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -10 +10 @@
 
 (function()
 {
-        // List of elements in which has no way to move editing focus outside.
-        var nonExitableElementNames = { table:1,pre:1 };
-
         // Matching an empty paragraph at the end of document.
-        var emptyParagraphRegexp = /(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;
+        var emptyParagraphRegexp = /(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;
 
         var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true );
 
-        // Elements that could have empty new line around, including table, pre-formatted block, hr, page-break. (#6554)
-        function nonExitable( element )
+        // Elements that could blink the cursor anchoring beside it, like hr, page-break. (#6554)
+        function nonEditable( element )
         {
-                return ( element.getName() in nonExitableElementNames )
-                                || element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ];
+                return element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ];
         }
 
 
@@ -409 +405 @@
                                 var element = fixedBlock.getNext( isNotWhitespace );
                                 if ( element &&
                                          element.type == CKEDITOR.NODE_ELEMENT &&
-                                         !nonExitable( element ) )
+                                         !nonEditable( element ) )
                                 {
                                         range.moveToElementEditStart( element );
                                         fixedBlock.remove();
@@ -419 +415 @@
                                         element = fixedBlock.getPrevious( isNotWhitespace );
                                         if ( element &&
                                                  element.type == CKEDITOR.NODE_ELEMENT &&
-                                                 !nonExitable( element ) )
+                                                 !nonEditable( element ) )
                                         {
                                                 range.moveToElementEditEnd( element );
                                                 fixedBlock.remove();
@@ -432 +428 @@
                         evt.cancel();
                 }
 
-                // 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 )
+                // Browsers are incapable of moving cursor out of certain block elements (e.g. table, div, pre)
+                // at the end of document, makes it unable to continue adding content, we have to make this
+                // easier by opening an new empty paragraph.
+                var testRange = new CKEDITOR.dom.range( editor.document );
+                testRange.moveToElementEditEnd( editor.document.getBody() );
+                var testPath = new CKEDITOR.dom.elementPath( testRange.startContainer );
+                if ( !testPath.blockLimit.is( 'body') )
                 {
-                        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 );