Changeset 38126

Timestamp:

07/21/2016 03:41:17 AM (10 years ago)

Author:

azaozz

Message:

TinyMCE, link check:

• Use wp.a11y.speak() to announce bad URLs.
• Do not add a title to the link toolbar.
• Better error message.

Props afercia, azaozz.
See #36638.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wplink/plugin.js (modified) (9 diffs)
• wp-includes/js/wplink.js (modified) (1 diff)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3907 +3907 @@
         }
 
+        // No redirects
         $response = wp_safe_remote_get( $href, array(
                 'timeout' => 15,
@@ -3913 +3914 @@
         ) );
 
-        $message = null;
+        $error = false;
 
         if ( is_wp_error( $response ) ) {
-                $error = $response->get_error_message();
-
-                if ( strpos( $message, 'resolve host' ) !== false ) {
-                        $message = array( 'error' => __( 'Invalid host name.' ) );
-                }
-
-                wp_send_json_error( $message );
-        }
-
-        if ( wp_remote_retrieve_response_code( $response ) === 404 ) {
-                wp_send_json_error( array( 'error' => __( 'Not found, HTTP error 404.' ) ) );
+                if ( strpos( $response->get_error_message(), 'resolve host' ) !== false ) {
+                        $error = true;
+                }
+        } elseif ( wp_remote_retrieve_response_code( $response ) === 404 ) {
+                $error = true;
+        }
+
+        if ( $error ) {
+                wp_send_json_error( array( 'httpError' => true ) );
         }
 

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

@@ -1066 +1066 @@
                         'Letter' => __( 'Letter' ),
                         'Action' => __( 'Action' ),
-                        'Invalid host name.' => __( 'Invalid host name.' ),
+                        'Warning: the link has been inserted but the destination cannot be reached.' => __( 'Warning: the link has been inserted but the destination cannot be reached.' ),
                         'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
                                 __( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),

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

@@ -95 +95 @@
                 var $ = window.jQuery;
                 var urlErrors = {};
+                var emailRegex = /^(mailto:)?[a-z0-9._%+-]+@[a-z0-9][a-z0-9.-]*\.[a-z]{2,63}$/i;
+                var speak = ( typeof window.wp !== 'undefined' && window.wp.a11y && window.wp.a11y.speak ) ? window.wp.a11y.speak : function() {};
+                var hasLinkError = false;
 
                 function getSelectedLink() {
@@ -148 +151 @@
                 }
 
+                function setLinkError( $link ) {
+                        hasLinkError = true;
+                        $link.attr( 'data-wplink-url-error', 'true' );
+                        speak( editor.translate( 'Warning: the link has been inserted but the destination cannot be reached.' ), 'assertive' );
+
+                        if ( toolbar && toolbar.visible() ) {
+                                toolbar.$el.find( '.wp-link-preview a' ).addClass( 'wplink-url-error' );
+                        }
+                }
+
                 function checkLink( node ) {
                         var $link = editor.$( node );
@@ -156 +169 @@
                         }
 
-                        // Early check
-                        if ( /^http/i.test( href ) && ! /\.[a-z]{2,63}(\/|$)/i.test( href ) ) {
-                                urlErrors[href] = tinymce.translate( 'Invalid host name.' );
+                        hasLinkError = false;
+
+                        if ( /^http/i.test( href ) && ! /^https?:\/\/[a-z0-9][a-z0-9.-]*\.[a-z]{2,63}(\/|$)/i.test( href ) ) {
+                                urlErrors[href] = true;
                         }
 
                         if ( urlErrors.hasOwnProperty( href ) ) {
-                                $link.attr( 'data-wplink-url-error', 'true' );
+                                setLinkError( $link );
                                 return;
                         } else {
@@ -180 +194 @@
                                 }
 
-                                if ( response.data && response.data.error ) {
-                                        urlErrors[href] = response.data.error;
-                                        $link.attr( 'data-wplink-url-error', 'true' );
-
-                                        if ( toolbar && toolbar.visible() ) {
-                                                toolbar.$el.find( '.wp-link-preview a' ).addClass( 'wplink-url-error' ).attr( 'title', editor.dom.encode( response.data.error ) );
-                                        }
+                                if ( response.data && response.data.httpError ) {
+                                        urlErrors[href] = true;
+                                        setLinkError( $link );
                                 }
                         });
@@ -275 +285 @@
                                 }
 
-                                if ( ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( href ) ) {
+                                if ( ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( href ) && ! emailRegex.test( href ) ) {
                                         href = 'http://' + href;
                                 }
@@ -292 +302 @@
 
                         // Audible confirmation message when a link has been inserted in the Editor.
-                        if ( typeof window.wp !== 'undefined' && window.wp.a11y && typeof window.wpLinkL10n !== 'undefined' ) {
-                                window.wp.a11y.speak( window.wpLinkL10n.linkInserted );
+                        if ( typeof window.wpLinkL10n !== 'undefined' && ! hasLinkError ) {
+                                speak( window.wpLinkL10n.linkInserted );
                         }
                 } );
@@ -450 +460 @@
                                                         $( element.firstChild.nextSibling ).val( ui.item.title );
 
-                                                        if ( 9 === event.keyCode && typeof window.wp !== 'undefined' &&
-                                                                window.wp.a11y && typeof window.wpLinkL10n !== 'undefined' ) {
+                                                        if ( 9 === event.keyCode && typeof window.wpLinkL10n !== 'undefined' ) {
                                                                 // Audible confirmation message when a link has been selected.
-                                                                window.wp.a11y.speak( window.wpLinkL10n.linkSelected );
+                                                                speak( window.wpLinkL10n.linkSelected );
                                                         }
 
@@ -537 +546 @@
                 editor.on( 'wptoolbar', function( event ) {
                         var linkNode = editor.dom.getParent( event.element, 'a' ),
-                                $linkNode, href, edit, title;
+                                $linkNode, href, edit;
 
                         if ( typeof window.wpLink !== 'undefined' && window.wpLink.modalOpen ) {
@@ -562 +571 @@
                                         event.element = linkNode;
                                         event.toolbar = toolbar;
-                                        title = urlErrors.hasOwnProperty( href ) ? editor.dom.encode( urlErrors[ href ] ) : null;
 
                                         if ( $linkNode.attr( 'data-wplink-url-error' ) === 'true' ) {
-                                                toolbar.$el.find( '.wp-link-preview a' ).addClass( 'wplink-url-error' ).attr( 'title', title );
+                                                toolbar.$el.find( '.wp-link-preview a' ).addClass( 'wplink-url-error' );
                                         } else {
-                                                toolbar.$el.find( '.wp-link-preview a' ).removeClass( 'wplink-url-error' ).attr( 'title', null );
+                                                toolbar.$el.find( '.wp-link-preview a' ).removeClass( 'wplink-url-error' );
+                                                hasLinkError = false;
                                         }
                                 }

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

@@ -3 +3 @@
 ( function( $, wpLinkL10n, wp ) {
         var editor, searchTimer, River, Query, correctedURL, linkNode,
-                emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
-                urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}[^ "]*$/i,
+                emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,63}$/i,
+                urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,63}[^ "]*$/i,
                 inputs = {},
                 rivers = {},