Ticket #28595: 28595.15.patch

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

@@ -74 +74 @@
                 editor.nodeChanged();
         }
 
-        function handleEnter( view, before ) {
+        function handleEnter( view, before, keyCode ) {
                 var dom = editor.dom,
-                        padNode;
-
-                if ( ! before && view.nextSibling && dom.isEmpty( view.nextSibling ) && view.nextSibling.nodeName === 'P' ) {
-                        padNode = view.nextSibling;
-                } else if ( before && view.previousSibling && dom.isEmpty( view.previousSibling ) && view.previousSibling.nodeName === 'P' ) {
-                        padNode = view.previousSibling;
-                } else {
                         padNode = dom.create( 'p' );
 
-                        if ( ! ( Env.ie && Env.ie < 11 ) ) {
-                                padNode.innerHTML = '<br data-mce-bogus="1">';
-                        }
+                if ( ! ( Env.ie && Env.ie < 11 ) ) {
+                        padNode.innerHTML = '<br data-mce-bogus="1">';
+                }
 
-                        if ( before ) {
-                                view.parentNode.insertBefore( padNode, view );
-                        } else {
-                                dom.insertAfter( padNode, view );
-                        }
+                if ( before ) {
+                        view.parentNode.insertBefore( padNode, view );
+                } else {
+                        dom.insertAfter( padNode, view );
                 }
 
                 deselect();
-                editor.getBody().focus();
-                editor.selection.setCursorLocation( padNode, 0 );
+
+                if ( before && keyCode === VK.ENTER ) {
+                        setViewCursor( before, view );
+                } else {
+                        editor.selection.setCursorLocation( padNode, 0 );
+                }
+
                 editor.nodeChanged();
         }
 
@@ -456 +453 @@
                 } else if ( cursorAfter ) {
                         handleEnter( view );
                 } else if ( cursorBefore ) {
-                        handleEnter( view , true);
+                        handleEnter( view , true, keyCode );
                 }
 
                 if ( keyCode === VK.ENTER ) {
@@ -630 +627 @@
                                         }, 500 );
                                 // If the cursor lands anywhere else in the view, set the cursor before it.
                                 // Only try this once to prevent a loop. (You never know.)
-                                } else if ( ! getParent( event.element, 'wpview-body' ) && ! setViewCursorTries ) {
+                                } else if ( ! getParent( event.element, 'wpview-clipboard' ) && ! setViewCursorTries ) {
                                         deselect();
                                         setViewCursorTries++;
                                         setViewCursor( true, view );