Changeset 36743

Timestamp:

02/27/2016 12:51:41 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE, inline link:

• Fix applying the changes when pressing the Enter key in Firefox. No longer inserts new paragraph in the editor.
• Fix empty check when getting text from the dialog.
• Always focus the URL field when opening the dialog.
• Add back the keydown events in the modal.

See #33301.

Location:

trunk/src/wp-includes/js

Files:

• tinymce/plugins/wplink/plugin.js (modified) (6 diffs)
• wplink.js (modified) (3 diffs)

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

@@ -69 +69 @@
                 },
                 getLinkText: function() {
-                        return tinymce.trim( this.getEl().firstChild.nextSibling.value );
+                        var text = this.getEl().firstChild.nextSibling.value;
+
+                        if ( ! tinymce.trim( text ) ) {
+                                return '';
+                        }
+
+                        return text.replace( /[\r\n\t ]+/g, ' ' );
                 },
                 reset: function() {
@@ -145 +151 @@
 
                                 editToolbar.on( 'show', function() {
-                                        var inputNode = editToolbar.find( 'toolbar' )[0];
-
-                                        if ( inputNode && ! tinymce.$( document.body ).hasClass( 'modal-open' ) ) {
+                                        if ( ! tinymce.$( document.body ).hasClass( 'modal-open' ) ) {
                                                 window.setTimeout( function() {
-                                                        inputNode.focus( true );
-                                                });
+                                                        var element = editToolbar.$el.find( 'input.ui-autocomplete-input' )[0];
+
+                                                        if ( element ) {
+                                                                element.focus();
+                                                                element.select();
+                                                        }
+                                                } );
                                         }
                                 } );
@@ -172 +181 @@
                                 return;
                         }
+
+                        editToolbar.tempHide = false;
 
                         if ( link ) {
@@ -182 +193 @@
                                         editor.windowManager.wplinkBookmark = editor.selection.getBookmark();
                                 }
+
+                                editor.nodeChanged();
                         }
                 } );
@@ -228 +241 @@
                                 removePlaceholders();
                                 editor.focus();
-        
+
                                 if ( tinymce.isIE ) {
                                         editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark );
                                         editor.windowManager.wplinkBookmark = null;
                                 }
-                                
+
                                 editToolbar.tempHide = false;
                         }
@@ -385 +398 @@
                                         if ( event.keyCode === 13 ) {
                                                 editor.execCommand( 'wp_link_apply' );
+                                                event.preventDefault();
                                         }
                                 } );

trunk/src/wp-includes/js/wplink.js

@@ -30 +30 @@
                         }
 
-                        inputs.submit.click( function( event ) {
+                        inputs.dialog.on( 'keydown', wpLink.keydown );
+                        inputs.submit.on( 'click', function( event ) {
                                 event.preventDefault();
                                 wpLink.update();
@@ -211 +212 @@
                                 window.setTimeout( function() {
                                         inputs.url.focus()[0].select();
-                                }, 100 );
+                                } );
                         }
 
@@ -432 +433 @@
                 },
 
+                keydown: function( event ) {
+                        var id;
+
+                        // Escape key.
+                        if ( 27 === event.keyCode ) {
+                                wpLink.close();
+                                event.stopImmediatePropagation();
+                        // Tab key.
+                        } else if ( 9 === event.keyCode ) {
+                                id = event.target.id;
+
+                                // wp-link-submit must always be the last focusable element in the dialog.
+                                // following focusable elements will be skipped on keyboard navigation.
+                                if ( id === 'wp-link-submit' && ! event.shiftKey ) {
+                                        inputs.close.focus();
+                                        event.preventDefault();
+                                } else if ( id === 'wp-link-close' && event.shiftKey ) {
+                                        inputs.submit.focus();
+                                        event.preventDefault();
+                                }
+                        }
+                },
+
                 setDefaultValues: function() {
                         var selection,