JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
vanilla ckeditor-3.6.6
[ckeditor.git] / _source / plugins / selection / plugin.js
index 39c6db7..e192e5e 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -72,29 +72,32 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
        function rangeRequiresFix( range )\r
        {\r
-               function isInlineCt( node )\r
+               function isTextCt( node, isAtEnd )\r
                {\r
-                       return node && node.type == CKEDITOR.NODE_ELEMENT\r
-                                       && node.getName() in CKEDITOR.dtd.$removeEmpty;\r
-               }\r
+                       if ( !node || node.type == CKEDITOR.NODE_TEXT )\r
+                               return false;\r
 \r
-               function singletonBlock( node )\r
-               {\r
-                       var body = range.document.getBody();\r
-                       return !node.is( 'body' ) && body.getChildCount() == 1;\r
+                       var testRng = range.clone();\r
+                       return testRng[ 'moveToElementEdit' + ( isAtEnd ? 'End' : 'Start' ) ]( node );\r
                }\r
 \r
-               var start = range.startContainer,\r
-                       offset = range.startOffset;\r
+               var ct = range.startContainer;\r
+\r
+               var previous = range.getPreviousNode( isVisible, null, ct ),\r
+                       next = range.getNextNode( isVisible, null, ct );\r
+\r
+               // Any adjacent text container may absorb the cursor, e.g.\r
+               // <p><strong>text</strong>^foo</p>\r
+               // <p>foo^<strong>text</strong></p>\r
+               // <div>^<p>foo</p></div>\r
+               if ( isTextCt( previous ) || isTextCt( next, 1 ) )\r
+                       return true;\r
 \r
-               if ( start.type == CKEDITOR.NODE_TEXT )\r
-                       return false;\r
+               // Empty block/inline element is also affected. <span>^</span>, <p>^</p> (#7222)\r
+               if ( !( previous || next ) && !( ct.type == CKEDITOR.NODE_ELEMENT && ct.isBlockBoundary() && ct.getBogus() ) )\r
+                       return true;\r
 \r
-               // 1. Empty inline element. <span>^</span>\r
-               // 2. Adjoin to inline element. <p><strong>text</strong>^</p>\r
-               // 3. The only empty block in document. <body><p>^</p></body> (#7222)\r
-               return !CKEDITOR.tools.trim( start.getHtml() ) ? isInlineCt( start ) || singletonBlock( start )\r
-                               : isInlineCt( start.getChild( offset - 1 ) ) || isInlineCt( start.getChild( offset ) );\r
+               return false;\r
        }\r
 \r
        var selectAllCmd =\r
@@ -162,11 +165,54 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                var fillingChar = doc && doc.removeCustomData( 'cke-fillingChar' );\r
                if ( fillingChar )\r
                {\r
+                       var bm,\r
+                       sel = doc.getSelection().getNative(),\r
+                       // Be error proof.\r
+                       range = sel && sel.type != 'None' && sel.getRangeAt( 0 );\r
+\r
+                       // Text selection position might get mangled by\r
+                       // subsequent dom modification, save it now for restoring. (#8617)\r
+                       if ( fillingChar.getLength() > 1\r
+                                && range && range.intersectsNode( fillingChar.$ ) )\r
+                       {\r
+                               bm = [ sel.anchorOffset, sel.focusOffset ];\r
+\r
+                               // Anticipate the offset change brought by the removed char.\r
+                               var startAffected = sel.anchorNode == fillingChar.$ && sel.anchorOffset > 0,\r
+                                       endAffected = sel.focusNode == fillingChar.$ && sel.focusOffset > 0;\r
+                               startAffected && bm[ 0 ]--;\r
+                               endAffected && bm[ 1 ]--;\r
+\r
+                               // Revert the bookmark order on reverse selection.\r
+                               isReversedSelection( sel ) && bm.unshift( bm.pop() );\r
+                       }\r
+\r
                        // We can't simply remove the filling node because the user\r
                        // will actually enlarge it when typing, so we just remove the\r
                        // invisible char from it.\r
                        fillingChar.setText( fillingChar.getText().replace( /\u200B/g, '' ) );\r
-                       fillingChar = 0;\r
+\r
+                       // Restore the bookmark.\r
+                       if ( bm )\r
+                       {\r
+                               var rng = sel.getRangeAt( 0 );\r
+                               rng.setStart( rng.startContainer, bm[ 0 ] );\r
+                               rng.setEnd( rng.startContainer, bm[ 1 ] );\r
+                               sel.removeAllRanges();\r
+                               sel.addRange( rng );\r
+                       }\r
+               }\r
+       }\r
+\r
+       function isReversedSelection( sel )\r
+       {\r
+               if ( !sel.isCollapsed )\r
+               {\r
+                       var range = sel.getRangeAt( 0 );\r
+                       // Potentially alter an reversed selection range.\r
+                       range.setStart( sel.anchorNode, sel.anchorOffset );\r
+                       range.setEnd( sel.focusNode, sel.focusOffset );\r
+                       return range.collapsed;\r
                }\r
        }\r
 \r
@@ -180,20 +226,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        {\r
                                editor.on( 'selectionChange', function() { checkFillingChar( editor.document ); } );\r
                                editor.on( 'beforeSetMode', function() { removeFillingChar( editor.document ); } );\r
-                               editor.on( 'key', function( e )\r
-                                       {\r
-                                               // Remove the filling char before some keys get\r
-                                               // executed, so they'll not get blocked by it.\r
-                                               switch ( e.data.keyCode )\r
-                                               {\r
-                                                       case 13 :       // ENTER\r
-                                                       case CKEDITOR.SHIFT + 13 :      // SHIFT-ENTER\r
-                                                       case 37 :       // LEFT-ARROW\r
-                                                       case 39 :       // RIGHT-ARROW\r
-                                                       case 8 :        // BACKSPACE\r
-                                                               removeFillingChar( editor.document );\r
-                                               }\r
-                                       }, null, null, 10 );\r
 \r
                                var fillingCharBefore,\r
                                        resetSelection;\r
@@ -240,6 +272,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        editor.on( 'contentDom', function()\r
                                {\r
                                        var doc = editor.document,\r
+                                               outerDoc = CKEDITOR.document,\r
                                                body = doc.getBody(),\r
                                                html = doc.getDocumentElement();\r
 \r
@@ -264,29 +297,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                if ( evt.data.$.srcElement.nodeName != 'BODY' )\r
                                                                        return;\r
 \r
-                                                               // If we have saved a range, restore it at this\r
+                                                               // Give the priority to locked selection since it probably\r
+                                                               // reflects the actual situation, besides locked selection\r
+                                                               // could be interfered because of text nodes normalizing.\r
+                                                               // (#6083, #6987)\r
+                                                               var lockedSelection = doc.getCustomData( 'cke_locked_selection' );\r
+                                                               if ( lockedSelection )\r
+                                                               {\r
+                                                                       lockedSelection.unlock( 1 );\r
+                                                                       lockedSelection.lock();\r
+                                                               }\r
+                                                               // Then check ff we have saved a range, restore it at this\r
                                                                // point.\r
-                                                               if ( savedRange )\r
+                                                               else if ( savedRange && restoreEnabled )\r
                                                                {\r
-                                                                       if ( restoreEnabled )\r
-                                                                       {\r
-                                                                               // Well not break because of this.\r
-                                                                               try\r
-                                                                               {\r
-                                                                                       savedRange.select();\r
-                                                                               }\r
-                                                                               catch (e)\r
-                                                                               {}\r
-\r
-                                                                               // Update locked selection because of the normalized text nodes. (#6083, #6987)\r
-                                                                               var lockedSelection = doc.getCustomData( 'cke_locked_selection' );\r
-                                                                               if ( lockedSelection )\r
-                                                                               {\r
-                                                                                       lockedSelection.unlock();\r
-                                                                                       lockedSelection.lock();\r
-                                                                               }\r
-                                                                       }\r
-\r
+                                                                       // Well not break because of this.\r
+                                                                       try { savedRange.select(); } catch (e) {}\r
                                                                        savedRange = null;\r
                                                                }\r
                                                        });\r
@@ -311,20 +337,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                restoreEnabled = 1;\r
                                                        });\r
 \r
-                                               // IE before version 8 will leave cursor blinking inside the document after\r
-                                               // editor blurred unless we clean up the selection. (#4716)\r
-                                               if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 )\r
+                                               // [IE] Iframe will still keep the selection when blurred, if\r
+                                               // focus is moved onto a non-editing host, e.g. link or button, but\r
+                                               // it becomes a problem for the object type selection, since the resizer\r
+                                               // handler attached on it will mark other part of the UI, especially\r
+                                               // for the dialog. (#8157)\r
+                                               // [IE<8] Even worse For old IEs, the cursor will not vanish even if\r
+                                               // the selection has been moved to another text input in some cases. (#4716)\r
+                                               //\r
+                                               // Now the range restore is disabled, so we simply force IE to clean\r
+                                               // up the selection before blur.\r
+                                               CKEDITOR.env.ie && editor.on( 'blur', function()\r
                                                {\r
-                                                       editor.on( 'blur', function( evt )\r
-                                                       {\r
-                                                               // Try/Catch to avoid errors if the editor is hidden. (#6375)\r
-                                                               try\r
-                                                               {\r
-                                                                       editor.document && editor.document.$.selection.empty();\r
-                                                               }\r
-                                                               catch (e) {}\r
-                                                       });\r
-                                               }\r
+                                                       // Error proof when the editor is not visible. (#6375)\r
+                                                       try{ doc.$.selection.empty(); } catch ( er){}\r
+                                               });\r
 \r
                                                // Listening on document element ensures that\r
                                                // scrollbar is included. (#5280)\r
@@ -341,20 +368,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        restoreEnabled = 1;\r
                                                });\r
 \r
-                                               // In IE6/7 the blinking cursor appears, but contents are\r
-                                               // not editable. (#5634)\r
-                                               if ( CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.version < 8 || CKEDITOR.env.quirks ) )\r
-                                               {\r
-                                                       // The 'click' event is not fired when clicking the\r
-                                                       // scrollbars, so we can use it to check whether\r
-                                                       // the empty space following <body> has been clicked.\r
-                                                       html.on( 'click', function( evt )\r
-                                                       {\r
-                                                               if ( evt.data.getTarget().getName() == 'html' )\r
-                                                                       editor.getSelection().getRanges()[ 0 ].select();\r
-                                                       });\r
-                                               }\r
-\r
                                                var scroll;\r
                                                // IE fires the "selectionchange" event when clicking\r
                                                // inside a selection. We don't want to capture that.\r
@@ -399,7 +412,117 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                saveSelection();\r
                                                        });\r
 \r
+                                               // When content doc is in standards mode, IE doesn't produce text selection\r
+                                               // when click on the region outside of body, we emulate\r
+                                               // the correct behavior here. (#1659, #7932, # 9097)\r
+                                               if ( doc.$.compatMode != 'BackCompat' )\r
+                                               {\r
+                                                       if ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat )\r
+                                                       {\r
+                                                               function moveRangeToPoint( range, x, y )\r
+                                                               {\r
+                                                                       // Error prune in IE7. (#9034, #9110)\r
+                                                                       try { range.moveToPoint( x, y ); } catch ( e ) {}\r
+                                                               }\r
+\r
+                                                               html.on( 'mousedown', function( evt )\r
+                                                               {\r
+                                                                       // Expand the text range along with mouse move.\r
+                                                                       function onHover( evt )\r
+                                                                       {\r
+                                                                               evt = evt.data.$;\r
+                                                                               if ( textRng )\r
+                                                                               {\r
+                                                                                       // Read the current cursor.\r
+                                                                                       var rngEnd = body.$.createTextRange();\r
+\r
+                                                                                       moveRangeToPoint( rngEnd, evt.x, evt.y );\r
+\r
+                                                                                       // Handle drag directions.\r
+                                                                                       textRng.setEndPoint(\r
+                                                                                               startRng.compareEndPoints( 'StartToStart', rngEnd ) < 0 ?\r
+                                                                                               'EndToEnd' :\r
+                                                                                               'StartToStart',\r
+                                                                                               rngEnd );\r
+\r
+                                                                                       // Update selection with new range.\r
+                                                                                       textRng.select();\r
+                                                                               }\r
+                                                                       }\r
+\r
+                                                                       function removeListeners()\r
+                                                                       {\r
+                                                                               outerDoc.removeListener( 'mouseup', onSelectEnd );\r
+                                                                               html.removeListener( 'mouseup', onSelectEnd );\r
+                                                                       }\r
+\r
+                                                                       function onSelectEnd()\r
+                                                                       {\r
 \r
+                                                                               html.removeListener( 'mousemove', onHover );\r
+                                                                               removeListeners();\r
+\r
+                                                                               // Make it in effect on mouse up. (#9022)\r
+                                                                               textRng.select();\r
+                                                                       }\r
+\r
+                                                                       evt = evt.data;\r
+\r
+                                                                       // We're sure that the click happens at the region\r
+                                                                       // outside body, but not on scrollbar.\r
+                                                                       if ( evt.getTarget().is( 'html' ) &&\r
+                                                                                        evt.$.x < html.$.clientWidth &&\r
+                                                                                        evt.$.y < html.$.clientHeight )\r
+                                                                       {\r
+                                                                               // Start to build the text range.\r
+                                                                               var textRng = body.$.createTextRange();\r
+                                                                               moveRangeToPoint( textRng, evt.$.x, evt.$.y );\r
+                                                                               // Records the dragging start of the above text range.\r
+                                                                               var startRng = textRng.duplicate();\r
+\r
+                                                                               html.on( 'mousemove', onHover );\r
+                                                                               outerDoc.on( 'mouseup', onSelectEnd );\r
+                                                                               html.on( 'mouseup', onSelectEnd );\r
+                                                                       }\r
+                                                               });\r
+                                                       }\r
+\r
+                                                       // It's much simpler for IE > 8, we just need to reselect the reported range.\r
+                                                       if ( CKEDITOR.env.ie8 )\r
+                                                       {\r
+                                                               html.on( 'mousedown', function( evt )\r
+                                                               {\r
+                                                                       if ( evt.data.getTarget().is( 'html' ) )\r
+                                                                       {\r
+                                                                               // Limit the text selection mouse move inside of editable. (#9715)\r
+                                                                               outerDoc.on( 'mouseup', onSelectEnd );\r
+                                                                               html.on( 'mouseup', onSelectEnd );\r
+                                                                       }\r
+\r
+                                                               });\r
+\r
+                                                               function removeListeners()\r
+                                                               {\r
+                                                                       outerDoc.removeListener( 'mouseup', onSelectEnd );\r
+                                                                       html.removeListener( 'mouseup', onSelectEnd );\r
+                                                               }\r
+\r
+                                                               function onSelectEnd()\r
+                                                               {\r
+                                                                       removeListeners();\r
+\r
+                                                                       // The event is not fired when clicking on the scrollbars,\r
+                                                                       // so we can safely check the following to understand\r
+                                                                       // whether the empty space following <body> has been clicked.\r
+                                                                               var sel = CKEDITOR.document.$.selection,\r
+                                                                                       range = sel.createRange();\r
+                                                                               // The selection range is reported on host, but actually it should applies to the content doc.\r
+                                                                               if ( sel.type != 'None' && range.parentElement().ownerDocument == doc.$ )\r
+                                                                                       range.select();\r
+                                                               }\r
+                                                       }\r
+\r
+                                               }\r
                                                // IE is the only to provide the "selectionchange"\r
                                                // event.\r
                                                doc.on( 'selectionchange', saveSelection );\r
@@ -449,7 +572,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                        return;\r
                                                                }\r
 \r
-                                                               savedRange = nativeSel && sel.getRanges()[ 0 ];\r
+                                                               // Not break because of this. (#9132)\r
+                                                               try{ savedRange = nativeSel && sel.getRanges()[ 0 ]; } catch( er ) {}\r
 \r
                                                                checkSelectionChangeTimeout.call( editor );\r
                                                        }\r
@@ -465,6 +589,32 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                doc.on( 'keyup', checkSelectionChangeTimeout, editor );\r
                                                doc.on( 'selectionchange', checkSelectionChangeTimeout, editor );\r
                                        }\r
+\r
+                                       if ( CKEDITOR.env.webkit )\r
+                                       {\r
+                                               // Before keystroke is handled by editor, check to remove the filling char.\r
+                                               doc.on( 'keydown', function( evt )\r
+                                               {\r
+                                                       var key = evt.data.getKey();\r
+                                                       // Remove the filling char before some keys get\r
+                                                       // executed, so they'll not get blocked by it.\r
+                                                       switch ( key )\r
+                                                       {\r
+                                                               case 13 :       // ENTER\r
+                                                               case 33 :       // PAGEUP\r
+                                                               case 34 :       // PAGEDOWN\r
+                                                               case 35 :       // HOME\r
+                                                               case 36 :       // END\r
+                                                               case 37 :       // LEFT-ARROW\r
+                                                               case 39 :       // RIGHT-ARROW\r
+                                                               case 8 :        // BACKSPACE\r
+                                                               case 45 :       // INS\r
+                                                               case 46 :       // DEl\r
+                                                                       removeFillingChar( editor.document );\r
+                                                       }\r
+\r
+                                               }, null, null, -1 );\r
+                                       }\r
                                });\r
 \r
                        // Clear the cached range path before unload. (#7174)\r
@@ -477,7 +627,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        command : 'selectAll'\r
                                });\r
 \r
-                       editor.selectionChange = checkSelectionChangeTimeout;\r
+                       /**\r
+                        * Check if to fire the {@link CKEDITOR.editor#selectionChange} event\r
+                        * for the current editor instance.\r
+                        *\r
+                        * @param {Boolean} checkNow Check immediately without any delay.\r
+                        */\r
+                       editor.selectionChange = function( checkNow )\r
+                       {\r
+                               ( checkNow ? checkSelectionChange : checkSelectionChangeTimeout ).call( this );\r
+                       };\r
 \r
                        // IE9 might cease to work if there's an object selection inside the iframe (#7639).\r
                        CKEDITOR.env.ie9Compat && editor.on( 'destroy', function()\r
@@ -573,10 +732,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                 */\r
                if ( CKEDITOR.env.ie )\r
                {\r
-                       var range = this.getNative().createRange();\r
-                       if ( !range\r
-                               || ( range.item && range.item(0).ownerDocument != this.document.$ )\r
-                               || ( range.parentElement && range.parentElement().ownerDocument != this.document.$ ) )\r
+                       // Avoid breaking because of it. (#8836)\r
+                       try\r
+                       {\r
+                               var range = this.getNative().createRange();\r
+                               if ( !range ||\r
+                                        ( range.item && range.item( 0 ).ownerDocument != this.document.$ ) ||\r
+                                        ( range.parentElement && range.parentElement().ownerDocument != this.document.$ ) )\r
+                               {\r
+                                       throw 0;\r
+                               }\r
+                       }\r
+                       catch ( e )\r
                        {\r
                                this.isInvalid = true;\r
                        }\r
@@ -737,7 +904,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        endIndex = siblings.length - 1,\r
                                                        index = -1,\r
                                                        position,\r
-                                                       distance;\r
+                                                       distance,\r
+                                                       container;\r
 \r
                                                // Binary search over all element childs to test the range to see whether\r
                                                // range is right on the boundary of one element.\r
@@ -758,12 +926,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                // e.g. <p>text<br />^<br /></p> (#7433)\r
                                                                if ( CKEDITOR.env.ie9Compat && child.tagName == 'BR' )\r
                                                                {\r
-                                                                       var bmId = 'cke_range_marker';\r
-                                                                       range.execCommand( 'CreateBookmark', false, bmId );\r
-                                                                       child = doc.getElementsByName( bmId )[ 0 ];\r
-                                                                       var offset = getNodeIndex( child );\r
-                                                                       parent.removeChild( child );\r
-                                                                       return { container : parent, offset : offset };\r
+                                                                       // "Fall back" to w3c selection.\r
+                                                                       var sel = doc.defaultView.getSelection();\r
+                                                                       return { container : sel[ start ? 'anchorNode' : 'focusNode' ],\r
+                                                                               offset : sel[ start ? 'anchorOffset' : 'focusOffset' ] };\r
                                                                }\r
                                                                else\r
                                                                        return { container : parent, offset : getNodeIndex( child ) };\r
@@ -790,7 +956,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        {\r
                                                                child = siblings[ siblings.length - 1 ];\r
 \r
-                                                               if ( child.nodeType == CKEDITOR.NODE_ELEMENT )\r
+                                                               if ( child.nodeType != CKEDITOR.NODE_TEXT )\r
                                                                        return { container : parent, offset : siblings.length };\r
                                                                else\r
                                                                        return { container : child, offset : child.nodeValue.length };\r
@@ -798,10 +964,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                                        // Start the measuring until distance overflows, meanwhile count the text nodes.\r
                                                        var i = siblings.length;\r
-                                                       while ( distance > 0 )\r
-                                                               distance -= siblings[ --i ].nodeValue.length;\r
+                                                       while ( distance > 0 && i > 0 )\r
+                                                       {\r
+                                                               sibling = siblings[ --i ];\r
+                                                               if ( sibling.nodeType == CKEDITOR.NODE_TEXT )\r
+                                                               {\r
+                                                                       container = sibling;\r
+                                                                       distance -= sibling.nodeValue.length;\r
+                                                               }\r
+                                                       }\r
 \r
-                                                       return  { container : siblings[ i ], offset : -distance };\r
+                                                       return  { container : container, offset : -distance };\r
                                                }\r
                                                // Test range was one offset beyond OR behind the anchored text node.\r
                                                else\r
@@ -826,7 +999,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                try\r
                                                                {\r
                                                                        sibling = child[ position > 0 ? 'previousSibling' : 'nextSibling' ];\r
-                                                                       distance -= sibling.nodeValue.length;\r
+                                                                       if ( sibling.nodeType == CKEDITOR.NODE_TEXT )\r
+                                                                       {\r
+                                                                               distance -= sibling.nodeValue.length;\r
+                                                                               container = sibling;\r
+                                                                       }\r
                                                                        child = sibling;\r
                                                                }\r
                                                                // Measurement in IE could be somtimes wrong because of <select> element. (#4611)\r
@@ -836,7 +1013,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                }\r
                                                        }\r
 \r
-                                                       return { container : child, offset : position > 0 ? -distance : child.nodeValue.length + distance };\r
+                                                       return { container : container, offset : position > 0 ? -distance : container.nodeValue.length + distance };\r
                                                }\r
                                        };\r
 \r
@@ -1157,7 +1334,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                        for ( var t in tags )\r
                                        {\r
-                                               if ( root = ancestor.getAscendant( t, 1 ) )\r
+                                               if ( ( root = ancestor.getAscendant( t, 1 ) ) )\r
                                                        break;\r
                                        }\r
 \r
@@ -1309,8 +1486,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        this.isLocked = 0;\r
                                        this.reset();\r
 \r
-                                       doc.getBody().focus();\r
-\r
                                        if ( selectedElement )\r
                                                this.selectElement( selectedElement );\r
                                        else\r
@@ -1595,11 +1770,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        start.scrollIntoView();\r
                }\r
        };\r
-})();\r
 \r
-( function()\r
-{\r
        var notWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),\r
+                       isVisible = CKEDITOR.dom.walker.invisible( 1 ),\r
                        fillerTextRegex = /\ufeff|\u00a0/,\r
                        nonCells = { table:1,tbody:1,tr:1 };\r
 \r