Changeset 37906

Timestamp:

06/29/2016 09:41:50 AM (8 years ago)

Author:

azaozz

Message:

TinyMCE, inline link dialog:

• Reset the internal state when doing unlink, pressing Escape, and clicking elsewhere in the editor.
• Add the unlink shortcut from the wplink plugin as it triggers the new wp_unlink command.

Fixes #36781, #36732, #37153.

Location:

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

Files:

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

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

@@ -541 +541 @@
             u: 'InsertUnorderedList',
             o: 'InsertOrderedList',
-            s: 'unlink',
             m: 'WP_Medialib',
             z: 'WP_Adv',

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

@@ -301 +301 @@
                 inputInstance.reset();
                 removePlaceholders();
-                editor.focus();
-                editToolbar.tempHide = false;
-            }
-        } );
-
-        // WP default shortcut
+            }
+        } );
+
+        editor.addCommand( 'wp_unlink', function() {
+            editor.execCommand( 'unlink' );
+            editToolbar.tempHide = false;
+            editor.execCommand( 'wp_link_cancel' );
+        } );
+
+        // WP default shortcuts
         editor.addShortcut( 'access+a', '', 'WP_Link' );
+        editor.addShortcut( 'access+s', '', 'wp_unlink' );
         // The "de-facto standard" shortcut, see #27305
         editor.addShortcut( 'meta+k', '', 'WP_Link' );
@@ -368 +373 @@
         // set a flag to not focus the inline dialog. The editor has to remain focused so the users can do consecutive undo/redo.
         editor.on( 'keydown', function( event ) {
+            if ( event.keyCode === 27 ) { // Esc
+                editor.execCommand( 'wp_link_cancel' );
+            }
+
             if ( event.altKey || ( tinymce.Env.mac && ( ! event.metaKey || event.ctrlKey ) ) ||
                 ( ! tinymce.Env.mac && ! event.ctrlKey ) ) {
@@ -561 +570 @@
                     }
                 }
+            } else {
+                editor.execCommand( 'wp_link_cancel' );
             }
         } );
@@ -573 +584 @@
             tooltip: 'Remove',
             icon: 'dashicon dashicons-no',
-            cmd: 'unlink'
+            cmd: 'wp_unlink'
         } );