Changeset 29333

Timestamp:

07/31/2014 11:27:14 PM (11 years ago)

Author:

azaozz

Message:

wpLink:

• Fix adding a link on pressing Enter.
• Don't auto-focus the URL field after selecting a local link.
• Don't auto-focus the URL field when opening on touch devices. Toggle focus/blur on it to close the onscreen keyboard so the modal is positioned properly.

See #28897.

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/wplink.js (modified) (5 diffs)

trunk/src/wp-includes/class-wp-editor.php

@@ -1377 +1377 @@
         <div id="link-modal-title">
             <?php _e( 'Insert/edit link' ) ?>
-            <button id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
+            <button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
         </div>
         <div id="link-selector">

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

@@ -3 +3 @@
 
 ( function( $ ) {
-    var inputs = {}, rivers = {}, editor, searchTimer, River, Query;
+    var editor, searchTimer, River, Query,
+        inputs = {},
+        rivers = {},
+        isTouch = ( 'ontouchend' in document );
 
     wpLink = {
@@ -54 +57 @@
 
             // Display 'hint' message when search field or 'query-results' box are focused
-            inputs.search.add( rivers.elements ).on( 'focus.wplink', function() {
+            inputs.search.on( 'focus.wplink', function() {
                 inputs.queryNoticeTextDefault.hide();
                 inputs.queryNoticeTextHint.removeClass( 'screen-reader-text' ).show();
@@ -121 +124 @@
             rivers.recent.refresh();
 
-            if ( wpLink.isMCE() )
+            if ( wpLink.isMCE() ) {
                 wpLink.mceRefresh();
-            else
+            } else {
                 wpLink.setDefaultValues();
-
-            // Focus the URL field and highlight its contents.
-            //     If this is moved above the selection changes,
-            //     IE will show a flashing cursor over the dialog.
-            inputs.url.focus()[0].select();
+            }
+
+            if ( isTouch ) {
+                // Close the onscreen keyboard
+                inputs.url.focus().blur();
+            } else {
+                // Focus the URL field and highlight its contents.
+                // If this is moved above the selection changes,
+                // IE will show a flashing cursor over the dialog.
+                inputs.url.focus()[0].select();
+            }
+
             // Load the most recent results if this is the first time opening the panel.
-            if ( ! rivers.recent.ul.children().length )
+            if ( ! rivers.recent.ul.children().length ) {
                 rivers.recent.ajax();
+            }
         },
 
@@ -275 +286 @@
         },
 
-        updateFields: function( e, li, originalEvent ) {
+        updateFields: function( e, li ) {
             inputs.url.val( li.children( '.item-permalink' ).val() );
             inputs.title.val( li.hasClass( 'no-title' ) ? '' : li.children( '.item-title' ).text() );
-            if ( originalEvent && originalEvent.type == 'click' )
-                inputs.url.focus();
         },
 
@@ -365 +374 @@
             }
 
-            if ( inputs.url.is( ':focus' ) || inputs.title.is( ':focus' ) ) {
+            if ( document.activeElement &&
+                ( document.activeElement.id === 'link-title-field' || document.activeElement.id === 'url-field' ) ) {
                 return;
             }