Ticket #26959: 26959-10.patch

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

@@ -109 +109 @@
 
                         dom.unbind( selected, 'beforedeactivate focusin focusout click mouseup', _stop );
                         dom.removeClass( selected, 'selected' );
-
-                        editor.selection.select( selected.nextSibling );
-                        editor.selection.collapse();
-
                 }
 
                 selected = null;
@@ -176 +172 @@
                         x = event.clientX;
                         y = event.clientY;
 
+                        // Detect events above or to the left if the first node is a wpview
                         if ( isView( firstNode ) && ( ( x < firstNode.offsetLeft && y < ( firstNode.offsetHeight - scrollTop ) ) ||
                                 y < firstNode.offsetTop ) ) {
-                                // detect events above or to the left of the first view
 
                                 padNode = createPadNode();
                                 body.insertBefore( padNode, firstNode );
+
+                        // Detect events to the right and below the last view
                         } else if ( isView( lastNode ) && ( x > ( lastNode.offsetLeft + lastNode.offsetWidth ) ||
                                 ( ( scrollTop + y ) - ( lastNode.offsetTop + lastNode.offsetHeight ) ) > 0 ) ) {
-                                // detect events to the right and below the last view
 
                                 padNode = createPadNode();
                                 body.appendChild( padNode );
@@ -305 +302 @@
         editor.on( 'keydown', function( event ) {
                 var keyCode = event.keyCode,
                         body = editor.getBody(),
-                        view, padNode;
+                        view, padNode, walker, node;
 
                 // If a view isn't selected, let the event go on its merry way.
                 if ( ! selected ) {
@@ -342 +339 @@
                                 editor.selection.setCursorLocation( body.firstChild, 0 );
                         // Handle default case
                         } else {
-                                editor.selection.select( view.previousSibling, true );
+                                walker = new TreeWalker( view, body );
+                                node = walker.prev( true );
+                                editor.selection.select( node, true );
                                 editor.selection.collapse();
                         }
                 } else if ( keyCode === VK.RIGHT || keyCode === VK.DOWN ) {
@@ -357 +356 @@
                                 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 );
+                                walker = new TreeWalker( view, body );
+                                node = walker.next( true );
+                                editor.selection.select( node, true );
+                                editor.selection.collapse( true );
                         }
                 } else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
                         // If delete or backspace is pressed, delete the view.
@@ -372 +374 @@
                 var keyCode = event.keyCode,
                         range = editor.selection.getRng(),
                         body = editor.getBody(),
+                        walker,
+                        view,
                         node;
 
                 if ( ! range.collapsed || event.metaKey || event.ctrlKey ) {
                         return;
                 }
 
-                if ( keyCode === VK.LEFT || keyCode === VK.UP ) {
-                        node = range.startContainer.parentNode === body ? range.startContainer : range.startContainer.parentNode;
+                if ( ( keyCode === VK.LEFT || keyCode === VK.UP ) && range.startOffset === 0 ) {
+                        walker = new TreeWalker( range.startContainer, body );
+                        node = walker.prev();
                         // The caret is directly after a wpview
-                        if ( range.startOffset === 0 && isView( node.previousSibling ) ) {
-                                select( node.previousSibling );
-                                event.preventDefault();
+                        if ( isView( range.startContainer.previousSibling ) ) {
+                                view = range.startContainer.previousSibling;
+                        } else if ( isView( node ) ) {
+                                view = node;
                         }
-                } else if ( keyCode === VK.RIGHT || keyCode === VK.DOWN ) {
-                        node = range.startContainer.parentNode === body ? range.startContainer : range.startContainer.parentNode;
+                } else if ( ( keyCode === VK.RIGHT || keyCode === VK.DOWN ) &&
+                        ( ( range.startOffset === 0 && ! range.endContainer.length ) || ( range.startOffset === range.endContainer.length ) ) ) {
+
+                        walker = new TreeWalker( range.endContainer, body );
+                        node = walker.next();
+
                         // The caret is directly before a wpview
-                        if ( ( ( range.startOffset === 0 && ! range.endContainer.length ) || ( range.startOffset === range.endContainer.length ) ) &&
-                                        isView( node.nextSibling ) ) {
-                                select( node.nextSibling );
-                                event.preventDefault();
+                        if ( isView( range.endContainer.nextSibling ) ) {
+                                view = range.endContainer.nextSibling;
+                        } else if ( isView( node ) ) {
+                                view = node;
                         }
                 }
+
+                if ( view ) {
+                        select( view );
+                        event.preventDefault();
+                }
         });
 
         editor.on( 'keyup', function( event ) {
@@ -423 +438 @@
                         // Allow an initial element in the document to be removed when it is before a view
                         if ( body.firstChild === range.startContainer && range.collapsed === true &&
                                         isView( range.startContainer.nextSibling ) && range.startOffset === 0 ) {
-
                                 editor.dom.remove( range.startContainer );
                         }
                 }