Ticket #28913: 28913.4.patch

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

@@ -343 +343 @@
                         range, clonedRange, tempRange, remove;
 
                 if ( selected ) {
-                        // Let key presses that involve the command or control keys through.
-                        // Also, let any of the F# keys through.
-                        if ( event.metaKey || event.ctrlKey || ( key >= 112 && key <= 123 ) ) {
-                                // But remove the view when cmd/ctrl + x/backspace are pressed.
-                                if ( ( event.metaKey || event.ctrlKey ) && ( key === 88 || key === VK.BACKSPACE ) ) {
-                                        // We'll remove a cut view on keyup, otherwise the browser can't copy the content.
-                                        if ( key === 88 ) {
-                                                toRemove = selected;
-                                        } else {
-                                                editor.dom.remove( selected );
-                                        }
+                        // Ignore key presses that involve the command or control key, but continue when in combination with backspace or v.
+                        // Also ignore the F# keys.
+                        if ( ( ( event.metaKey || event.ctrlKey ) && key !== VK.BACKSPACE && key !== 86 ) || ( key >= 112 && key <= 123 ) ) {
+                                // Remove the view when pressing cmd/ctrl+x on keyup, otherwise the browser can't copy the content.
+                                if ( ( event.metaKey || event.ctrlKey ) && key === 88 ) {
+                                        toRemove = selected;
                                 }
                                 return;
                         }
@@ -437 +432 @@
                                 }
                         }
 
-                        // Make sure we don't eat any content.
-                        if ( event.keyCode === VK.BACKSPACE ) {
-                                if ( editor.dom.isEmpty( node ) ) {
-                                        if ( view = getView( node.previousSibling ) ) {
+                        if ( ! view ) {
+                                // Make sure we don't eat any content.
+                                if ( event.keyCode === VK.BACKSPACE ) {
+                                        if ( editor.dom.isEmpty( node ) ) {
+                                                if ( view = getView( node.previousSibling ) ) {
+                                                        setViewCursor( false, view );
+                                                        editor.dom.remove( node );
+                                                        event.preventDefault();
+                                                }
+                                        } else if ( ( range = selection.getRng() ) &&
+                                                        range.startOffset === 0 &&
+                                                        range.endOffset === 0 &&
+                                                        ( view = getView( node.previousSibling ) ) ) {
                                                 setViewCursor( false, view );
-                                                editor.dom.remove( node );
                                                 event.preventDefault();
-                                                return;
                                         }
-                                } else if ( ( range = selection.getRng() ) &&
-                                                range.startOffset === 0 &&
-                                                range.endOffset === 0 &&
-                                                ( view = getView( node.previousSibling ) ) ) {
-                                        setViewCursor( false, view );
-                                        event.preventDefault();
-                                        return;
                                 }
-                        }
-
-                        if ( ! view ) {
                                 return;
                         }