Ticket #26959: 26959-11.patch

src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -336 +336 @@
                         if ( isView( view.previousSibling ) ) {
                                 select( view.previousSibling );
                         // Handle case where view is the first node
-                        } else if ( view.previousSibling === null ) {
+                        } else if ( ! view.previousSibling ) {
                                 padNode = createPadNode();
                                 body.insertBefore( padNode, body.firstChild );
                                 editor.selection.setCursorLocation( body.firstChild, 0 );
@@ -351 +351 @@
                         if ( isView( view.nextSibling ) ) {
                                 select( view.nextSibling );
                         // Handle case were the view is that last node
-                        } else if ( view.nextSibling === null ) {
+                        } else if ( ! view.nextSibling ) {
                                 padNode = createPadNode();
                                 body.appendChild( padNode );
                                 editor.selection.setCursorLocation( body.lastChild, 0 );
                         // Handle default case where the next node is a non-wpview
                         } else {
-                                editor.selection.setCursorLocation( view.nextSibling.firstChild, 0 );
+                                editor.selection.setCursorLocation( view.nextSibling, 0 );
                         }
                 } else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
                         // If delete or backspace is pressed, delete the view.
@@ -370 +370 @@
         // Select and deselect views when arrow keys are used to navigate the content of the editor.
         editor.on( 'keydown', function( event ) {
                 var keyCode = event.keyCode,
+                        dom = editor.dom,
                         range = editor.selection.getRng(),
+                        startNode = range.startContainer,
                         body = editor.getBody(),
-                        node;
+                        node, container;
 
-                if ( ! range.collapsed || event.metaKey || event.ctrlKey ) {
+                if ( ! startNode || startNode === body || event.metaKey || event.ctrlKey ) {
                         return;
                 }
 
-                if ( keyCode === VK.LEFT || keyCode === VK.UP ) {
-                        node = range.startContainer.parentNode === body ? range.startContainer : range.startContainer.parentNode;
-                        // The caret is directly after a wpview
-                        if ( range.startOffset === 0 && isView( node.previousSibling ) ) {
+                if ( keyCode === VK.UP || keyCode === VK.LEFT ) {
+                        if ( keyCode === VK.LEFT && ( ! range.collapsed || range.startOffset !== 0 ) ) {
+                                // Not at the beginning of the current range
+                                return;
+                        }
+
+                        node = dom.getParent( startNode, dom.isBlock );
+
+                        if ( ! node ) {
+                                return;
+                        }
+
+                        while ( node && node.parentNode !== body ) {
+                                if ( node.previousSibling ) {
+                                        // The caret will be in another element
+                                        return;
+                                }
+
+                                node = node.parentNode;
+                        }
+
+                        if ( isView( node.previousSibling ) ) {
                                 select( node.previousSibling );
                                 event.preventDefault();
                         }
-                } else if ( keyCode === VK.RIGHT || keyCode === VK.DOWN ) {
-                        node = range.startContainer.parentNode === body ? range.startContainer : range.startContainer.parentNode;
-                        // The caret is directly before a wpview
-                        if ( ( ( range.startOffset === 0 && ! range.endContainer.length ) || ( range.startOffset === range.endContainer.length ) ) &&
-                                        isView( node.nextSibling ) ) {
+                } else if ( keyCode === VK.DOWN || keyCode === VK.RIGHT ) {
+                        node = dom.getParent( startNode, dom.isBlock );
+
+                        if ( ! node ) {
+                                return;
+                        }
+
+                        if ( keyCode === VK.RIGHT ) {
+                                container = range.endContainer;
+
+                                if ( ! range.collapsed || ( range.startOffset === 0 && container.length ) ||
+                                        container.nextSibling ||
+                                        ( container.nodeType === 3 && range.startOffset !== container.length ) ) { // Not at the end of the current range
+
+                                        return;
+                                }
+
+                                // In a child element
+                                while ( container && container !== node && container !== body ) {
+                                        if ( container.nextSibling ) {
+                                                return;
+                                        }
+                                        container = container.parentNode;
+                                }
+                        }
+
+                        while ( node && node.parentNode !== body ) {
+                                if ( node.nextSibling ) {
+                                        // The caret will be in another element
+                                        return;
+                                }
+
+                                node = node.parentNode;
+                        }
+
+                        if ( isView( node.nextSibling ) ) {
                                 select( node.nextSibling );
                                 event.preventDefault();
                         }