<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38126] trunk/src: TinyMCE, link check:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38126">38126</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38126","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-07-21 03:41:17 +0000 (Thu, 21 Jul 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/36638">#36638</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswplinkpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjswplinkjs">trunk/src/wp-includes/js/wplink.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2016-07-20 19:32:05 UTC (rev 38125)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2016-07-21 03:41:17 UTC (rev 38126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3906,26 +3906,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $href = get_bloginfo( 'url' ) . $href;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // No redirects
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = wp_safe_remote_get( $href, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 15,
</span><span class="cx" style="display: block; padding: 0 10px"> // Use an explicit user-agent
</span><span class="cx" style="display: block; padding: 0 10px"> 'user-agent' => 'WordPress URL Test',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error = $response->get_error_message();
-
- if ( strpos( $message, 'resolve host' ) !== false ) {
- $message = array( 'error' => __( 'Invalid host name.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strpos( $response->get_error_message(), 'resolve host' ) !== false ) {
+ $error = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- wp_send_json_error( $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( wp_remote_retrieve_response_code( $response ) === 404 ) {
+ $error = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_remote_retrieve_response_code( $response ) === 404 ) {
- wp_send_json_error( array( 'error' => __( 'Not found, HTTP error 404.' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $error ) {
+ wp_send_json_error( array( 'httpError' => true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success();
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2016-07-20 19:32:05 UTC (rev 38125)
+++ trunk/src/wp-includes/class-wp-editor.php 2016-07-21 03:41:17 UTC (rev 38126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1065,7 +1065,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Ctrl + letter:' => __( 'Ctrl + letter:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Letter' => __( 'Letter' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Action' => __( 'Action' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Invalid host name.' => __( 'Invalid host name.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Warning: the link has been inserted but the destination cannot be reached.' => __( 'Warning: the link has been inserted but the destination cannot be reached.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '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.' =>
</span><span class="cx" style="display: block; padding: 0 10px"> __( '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.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswplinkpluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js 2016-07-20 19:32:05 UTC (rev 38125)
+++ trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js 2016-07-21 03:41:17 UTC (rev 38126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,6 +94,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var doingUndoRedoTimer;
</span><span class="cx" style="display: block; padding: 0 10px"> var $ = window.jQuery;
</span><span class="cx" style="display: block; padding: 0 10px"> var urlErrors = {};
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function getSelectedLink() {
</span><span class="cx" style="display: block; padding: 0 10px"> var href, html,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,6 +150,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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' );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function checkLink( node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var $link = editor.$( node );
</span><span class="cx" style="display: block; padding: 0 10px"> var href = $link.attr( 'href' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,13 +168,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Early check
- if ( /^http/i.test( href ) && ! /\.[a-z]{2,63}(\/|$)/i.test( href ) ) {
- urlErrors[href] = tinymce.translate( 'Invalid host name.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ hasLinkError = false;
+
+ if ( /^http/i.test( href ) && ! /^https?:\/\/[a-z0-9][a-z0-9.-]*\.[a-z]{2,63}(\/|$)/i.test( href ) ) {
+ urlErrors[href] = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( urlErrors.hasOwnProperty( href ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link.attr( 'data-wplink-url-error', 'true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setLinkError( $link );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $link.removeAttr( 'data-wplink-url-error' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,13 +193,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( response.data && response.data.httpError ) {
+ urlErrors[href] = true;
+ setLinkError( $link );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( href ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( href ) && ! emailRegex.test( href ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> href = 'http://' + href;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,8 +301,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.nodeChanged();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Audible confirmation message when a link has been inserted in the Editor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( typeof window.wp !== 'undefined' && window.wp.a11y && typeof window.wpLinkL10n !== 'undefined' ) {
- window.wp.a11y.speak( window.wpLinkL10n.linkInserted );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( typeof window.wpLinkL10n !== 'undefined' && ! hasLinkError ) {
+ speak( window.wpLinkL10n.linkInserted );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,10 +459,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $input.val( ui.item.permalink );
</span><span class="cx" style="display: block; padding: 0 10px"> $( element.firstChild.nextSibling ).val( ui.item.title );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 9 === event.keyCode && typeof window.wp !== 'undefined' &&
- window.wp.a11y && typeof window.wpLinkL10n !== 'undefined' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 9 === event.keyCode && typeof window.wpLinkL10n !== 'undefined' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Audible confirmation message when a link has been selected.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.wp.a11y.speak( window.wpLinkL10n.linkSelected );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ speak( window.wpLinkL10n.linkSelected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,7 +545,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'wptoolbar', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var linkNode = editor.dom.getParent( event.element, 'a' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $linkNode, href, edit, title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $linkNode, href, edit;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof window.wpLink !== 'undefined' && window.wpLink.modalOpen ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editToolbar.tempHide = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,12 +570,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> previewInstance.setURL( href );
</span><span class="cx" style="display: block; padding: 0 10px"> event.element = linkNode;
</span><span class="cx" style="display: block; padding: 0 10px"> event.toolbar = toolbar;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- title = urlErrors.hasOwnProperty( href ) ? editor.dom.encode( urlErrors[ href ] ) : null;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $linkNode.attr( 'data-wplink-url-error' ) === 'true' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- toolbar.$el.find( '.wp-link-preview a' ).addClass( 'wplink-url-error' ).attr( 'title', title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toolbar.$el.find( '.wp-link-preview a' ).addClass( 'wplink-url-error' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- toolbar.$el.find( '.wp-link-preview a' ).removeClass( 'wplink-url-error' ).attr( 'title', null );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toolbar.$el.find( '.wp-link-preview a' ).removeClass( 'wplink-url-error' );
+ hasLinkError = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( editToolbar.visible() ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjswplinkjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/wplink.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wplink.js 2016-07-20 19:32:05 UTC (rev 38125)
+++ trunk/src/wp-includes/js/wplink.js 2016-07-21 03:41:17 UTC (rev 38126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,8 +2,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( $, wpLinkL10n, wp ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var editor, searchTimer, River, Query, correctedURL, linkNode,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
- urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}[^ "]*$/i,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,63}$/i,
+ urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,63}[^ "]*$/i,
</ins><span class="cx" style="display: block; padding: 0 10px"> inputs = {},
</span><span class="cx" style="display: block; padding: 0 10px"> rivers = {},
</span><span class="cx" style="display: block; padding: 0 10px"> isTouch = ( 'ontouchend' in document );
</span></span></pre>
</div>
</div>
</body>
</html>