Ticket #28913: 28913.patch

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

@@ -350 +350 @@
                         node = selection.getNode(),
                         view = getView( node ),
                         cursorBefore, cursorAfter,
-                        range, clonedRange, tempRange;
+                        range, clonedRange, tempRange, remove;
 
                 lastKeyDownNode = node;
 
@@ -433 +433 @@
                         event.preventDefault();
                         event.stopImmediatePropagation();
                 } else if ( cursorAfter && keyCode === VK.BACKSPACE ) {
-                        dom.remove( view );
+                        remove = view;
+                        handleEnter( view );
+                        dom.remove( remove );
                         event.preventDefault();
+                        event.stopImmediatePropagation();
                 } else if ( cursorAfter ) {
                         handleEnter( view );
                 } else if ( cursorBefore ) {
@@ -451 +454 @@
                 var dom = editor.dom,
                         keyCode = event.keyCode,
                         selection = editor.selection,
-                        view;
+                        view, remove;
 
                 // If a view isn't selected, let the event go on its merry way.
                 if ( ! selected ) {
@@ -483 +486 @@
 
                 if ( keyCode === VK.LEFT ) {
                         setViewCursor( true, view );
+                        event.preventDefault();
                 } else if ( keyCode === VK.UP ) {
                         if ( view.previousSibling ) {
                                 if ( getView( view.previousSibling ) ) {
@@ -495 +499 @@
                         } else {
                                 setViewCursor( true, view );
                         }
-
+                        event.preventDefault();
                 } else if ( keyCode === VK.RIGHT ) {
                         setViewCursor( false, view );
+                        event.preventDefault();
                 } else if ( keyCode === VK.DOWN ) {
                         if ( view.nextSibling ) {
                                 if ( getView( view.nextSibling ) ) {
@@ -509 +514 @@
                         } else {
                                 setViewCursor( false, view );
                         }
-                } else if ( keyCode === VK.ENTER ) {
-                        handleEnter( view );
-                } else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
-                        dom.remove( selected );
-                }
+                        event.preventDefault();
+                } else {
+                        remove = selected;
+                        handleEnter( selected );
+                        dom.remove( remove );
 
-                event.preventDefault();
+                        if ( keyCode === VK.ENTER || keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
+                                event.preventDefault();
+                                event.stopImmediatePropagation();
+                        }
+                }
         });
 
         // Make sure we don't eat any content.