Ticket #28595: 28595.17.patch

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

@@ -15 +15 @@
         editor.addShortcut( 'ctrl+k', '', 'WP_Link' );
 
         function setState( button, node ) {
-                var parent = editor.dom.getParent( node, 'a' );
+                var parent = editor.dom.getParent( node, 'a' ),
+                        getView = editor.plugins.wpview ? editor.plugins.wpview.getView : false;
 
-                button.disabled( ( editor.selection.isCollapsed() && ! parent ) || ( parent && ! parent.href ) );
+                button.disabled( ( editor.selection.isCollapsed() && ! parent ) || ( parent && ! parent.href ) || getView( node ) );
                 button.active( parent && parent.href );
         }
 

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

@@ -1 +1 @@
 /* global tinymce */
+
 /**
  * WordPress View plugin.
  */
@@ -21 +22 @@
          */
         function getParent( node, className ) {
                 while ( node && node.parentNode ) {
-                        if ( node.className && (' ' + node.className + ' ').indexOf(' ' + className + ' ') !== -1 ) {
+                        if ( node.className && ( ' ' + node.className + ' ' ).indexOf( ' ' + className + ' ' ) !== -1 ) {
                                 return node;
                         }
 
@@ -584 +585 @@
                 editor.dom.removeClass( editor.getBody(), 'has-focus' );
         } );
 
-        editor.on( 'nodechange', function( event ) {
+        editor.on( 'NodeChange', function( event ) {
                 var dom = editor.dom,
                         views = editor.dom.select( '.wpview-wrap' ),
                         className = event.element.className,
@@ -638 +639 @@
                 }
         });
 
-        editor.on( 'resolvename', function( event ) {
+        editor.on( 'BeforeExecCommand', function( event ) {
+                var cmd = event.command,
+                        view;
+
+                if ( cmd === 'undo' || cmd === 'redo' || cmd === 'RemoveFormat' ) {
+                        return;
+                }
+
+                if ( view = getView( editor.selection.getNode() ) ) {
+                        handleEnter( view );
+                }
+        });
+
+        editor.on( 'ResolveName', function( event ) {
                 if ( editor.dom.hasClass( event.target, 'wpview-wrap' ) ) {
                         event.name = editor.dom.getAttrib( event.target, 'data-wpview-type' ) || 'wpview';
                         event.stopPropagation();