Changeset 29183

Timestamp:

07/16/2014 12:09:58 AM (12 years ago)

Author:

azaozz

Message:

TinyMCE wpView:

• Cast off commands targeted to a view except undo, redo, RemoveFormat and mceToggleFormat (bold, italic, etc.).
• Disable the link and unlink buttons when a view is selected.

Props avryl, see #28595

Location:

trunk/src/wp-includes/js/tinymce/plugins

Files:

• wplink/plugin.js (modified) (1 diff)
• wpview/plugin.js (modified) (4 diffs)

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

@@ -16 +16 @@
 
         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 : function() { return 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 );
         }

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

@@ -1 +1 @@
 /* global tinymce */
+
 /**
  * WordPress View plugin.
@@ -22 +23 @@
         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;
                         }
@@ -564 +565 @@
         } );
 
-        editor.on( 'nodechange', function( event ) {
+        editor.on( 'NodeChange', function( event ) {
                 var dom = editor.dom,
                         views = editor.dom.select( '.wpview-wrap' ),
@@ -618 +619 @@
         });
 
-        editor.on( 'resolvename', function( event ) {
+        editor.on( 'BeforeExecCommand', function( event ) {
+                var cmd = event.command,
+                        view;
+
+                if ( cmd === 'undo' || cmd === 'redo' || cmd === 'RemoveFormat' || cmd === 'mceToggleFormat' ) {
+                        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';