Ticket #28595: 28595.18.patch

src/wp-includes/js/mce-view.js

@@ -1 @@
-/* global tinymce, MediaElementPlayer, WPPlaylistView */
+/* global tinymce */
 /**
  * Note: this API is "experimental" meaning that it will probably change
  * in the next few releases based on feedback from 3.9.0.

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

@@ -10 +10 @@
                 TreeWalker = tinymce.dom.TreeWalker,
                 toRemove = false,
                 firstFocus = true,
-                cursorInterval, lastKeyDownNode, setViewCursorTries, focus;
+                cursorInterval, lastKeyDownNode, setViewCursorTries, focus, execCommandView;
 
         function getView( node ) {
                 return getParent( node, 'wpview-wrap' );
@@ -581 +581 @@
 
                 if ( focus ) {
                         if ( view ) {
-                                if ( className === 'wpview-selection-before' || className === 'wpview-selection-after' && editor.selection.isCollapsed() ) {
+                                if ( ( className === 'wpview-selection-before' || className === 'wpview-selection-after' ) && editor.selection.isCollapsed() ) {
                                         setViewCursorTries = 0;
 
                                         deselect();
@@ -618 +618 @@
                 }
         });
 
-        editor.on( 'BeforeExecCommand', function( event ) {
-                var cmd = event.command,
+        editor.on( 'BeforeExecCommand', function() {
+                var node = editor.selection.getNode(),
                         view;
 
-                if ( cmd === 'undo' || cmd === 'redo' || cmd === 'RemoveFormat' || cmd === 'mceToggleFormat' ) {
-                        return;
+                if ( node && ( node.className === 'wpview-selection-before' || node.className === 'wpview-selection-after' ) && ( view = getView( node ) ) ) {
+                        handleEnter( view );
+                        execCommandView = view;
                 }
+        });
 
-                if ( view = getView( editor.selection.getNode() ) ) {
-                        handleEnter( view );
+        editor.on( 'ExecCommand', function() {
+                var toSelect, node;
+
+                if ( selected ) {
+                        toSelect = selected;
+                        deselect();
+                        select( toSelect );
+                }
+
+                if ( execCommandView ) {
+                        node = execCommandView.nextSibling;
+
+                        if ( node && node.nodeName === 'P' && editor.dom.isEmpty( node ) ) {
+                                editor.dom.remove( node );
+                                setViewCursor( false, execCommandView );
+                        }
+
+                        execCommandView = false;
                 }
         });