Ticket #26959: 26959-07.patch

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

@@ -86 +86 @@
                 editor.dom.bind( clipboard, 'beforedeactivate focusin focusout', _stop );
                 editor.dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
 
+                // Make sure that the editor is focused.
+                // It is possible that the editor is not focused when the mouse event fires
+                // without focus, the selection will not work properly.
+                editor.getBody().focus();
+
                 // select the hidden div
                 editor.selection.select( clipboard, true );
         }
@@ -156 +161 @@
                                 editor.selection.setCursorLocation( padNode, 0 );
                         }
                 }
-
-        //      refreshEmptyContentNode();
         });
 
         // Detect mouse down events that are adjacent to a view when a view is the first view or the last view
@@ -188 +191 @@
                         }
 
                         if ( padNode ) {
+                                // Make sure that a selected view is deselected so that focus and selection are handled properly
+                                deselect();
+                                editor.getBody().focus();
                                 editor.selection.setCursorLocation( padNode, 0 );
                         }
                 }
@@ -298 +304 @@
 
         editor.on( 'keydown', function( event ) {
                 var keyCode = event.keyCode,
-                        view;
+                        body = editor.getBody(),
+                        view, padNode;
 
                 // If a view isn't selected, let the event go on its merry way.
                 if ( ! selected ) {
@@ -323 +330 @@
                         return;
                 }
 
+                if ( keyCode === VK.LEFT || keyCode === VK.UP ) {
+                        deselect();
+                        if ( isView( view.previousSibling ) ) {
+                                select( view.previousSibling );
+                        } else if ( view.previousSibling === null ) {
+                                padNode = createPadNode();
+                                body.insertBefore( padNode, body.firstChild );
+                                editor.selection.setCursorLocation( body.firstChild, 0 );
+                        } else {
+                                editor.selection.select( view.previousSibling, true );
+                                editor.selection.collapse();
+                        }
+                }
+
+                if ( keyCode === VK.RIGHT || keyCode === VK.DOWN ) {
+                        deselect();
+                        if ( isView( view.nextSibling ) ) {
+                                select( view.nextSibling );
+                        } else if ( view.nextSibling === null ) {
+                                padNode = createPadNode();
+                                body.appendChild( padNode );
+                                editor.selection.setCursorLocation( body.lastChild, 0 );
+
+                        } else {
+                                editor.selection.setCursorLocation( view.nextSibling.firstChild, 0 );
+                        }
+                }
+
                 // If delete or backspace is pressed, delete the view.
                 if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
                         editor.dom.remove( selected );
@@ -331 +366 @@
                 event.preventDefault();
         });
 
+        // 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,
+                        range = editor.selection.getRng();
+
+                if ( range.collapsed !== true ) {
+                        return;
+                }
+
+                if ( keyCode === VK.LEFT || keyCode === VK.UP ) {
+                        if ( range.startOffset === 0 && isView( range.startContainer.parentNode.previousSibling ) ) {
+                                select( range.startContainer.parentNode.previousSibling );
+                                event.preventDefault();
+                                return;
+                        }
+
+                } else if ( keyCode === VK.RIGHT || keyCode === VK.DOWN ) {
+                        if ( range.startOffset === range.endContainer.length && isView( range.startContainer.parentNode.nextSibling ) ) {
+                                select( range.endContainer.parentNode.nextSibling );
+                                event.preventDefault();
+                                return;
+                        }
+
+                }
+
+
+        });
+
         editor.on( 'keyup', function( event ) {
                 var padNode,
                         keyCode = event.keyCode,