Changeset 29246

Timestamp:

07/19/2014 07:29:34 AM (9 years ago)

Author:

azaozz

Message:

TinyMCE wpView: better removal of views, replace a selected view when pasting. Props avryl, fixes #28913.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (modified) (8 diffs)

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

@@ -102 +102 @@
     }
 
+    function removeView( view ) {
+        // TODO: trigger an event to run a clean up function.
+        // Maybe `jQuery( view ).trigger( 'remove' );`?
+        editor.undoManager.transact( function() {
+            handleEnter( view );
+            editor.dom.remove( view );
+        });
+    }
+
     function select( viewNode ) {
         var clipboard,
@@ -184 +193 @@
         if ( ! event.content ) {
             return;
+        }
+
+        if ( selected ) {
+            removeView( selected );
         }
 
@@ -294 +307 @@
                         wp.mce.views.edit( view );
                     } else if ( editor.dom.hasClass( event.target, 'remove' ) ) {
-                        editor.dom.remove( view );
+                        removeView( view );
                     }
                 }
@@ -341 +354 @@
             selection = editor.selection,
             node, view, cursorBefore, cursorAfter,
-            range, clonedRange, tempRange, remove;
+            range, clonedRange, tempRange;
 
         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;
@@ -400 +408 @@
             // Ignore keys that don't insert anything.
             } else if ( ( key > 47 || VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) && key !== 144 && key !== 145 ) {
-                editor.undoManager.transact( function() {
-                    remove = selected;
-                    handleEnter( selected );
-                    dom.remove( remove );
-                });
+                removeView( selected );
 
                 if ( key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) {
@@ -438 +442 @@
             }
 
-            // 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;
             }
@@ -516 +517 @@
                 event.preventDefault();
             } else if ( cursorAfter && key === VK.BACKSPACE ) {
-                editor.undoManager.transact( function() {
-                    handleEnter( view );
-                    dom.remove( view );
-                });
+                removeView( view );
                 event.preventDefault();
             } else if ( cursorAfter ) {
@@ -535 +533 @@
     editor.on( 'keyup', function() {
         if ( toRemove ) {
-            editor.dom.remove( toRemove );
+            removeView( toRemove );
             toRemove = false;
         }