Changeset 894

Timestamp:

10/08/07 22:49:23 (6 years ago)

Author:

ray

Message:

• #1083 Convert URLs to links - Error
  
• #1084 URL auto-linking (Gecko): URLs with user:password@domain.tld falsely recognized as email address
  
• #1085 URL auto-linking (Gecko): IP numbers don't work
  

Location:

trunk

Files:

• XinhaCore.js (modified) (1 diff)
• modules/Gecko/Gecko.js (modified) (3 diffs)

trunk/XinhaCore.js

@@ -457 +457 @@
 * @type RegExp
 */
-Xinha.RE_email    = /[_a-z\d\-\.]{3,}@[_a-z\d\-]{2,}(\.[_a-z\d\-]{2,})+/i;
+Xinha.RE_email    = /^[_a-z\d\-\.]{3,}@[_a-z\d\-]{2,}(\.[_a-z\d\-]{2,})+$/i;
 /** Identifies URLs
 * @type RegExp

trunk/modules/Gecko/Gecko.js

@@ -167 +167 @@
           if (RE_date.test(matchData))
           {
-            if (!RE_ip.test(matchData)) 
+            break; //ray: disabling linking of IP numbers because of general bugginess (see Ticket #1085)
+                        /*if (!RE_ip.test(matchData)) 
             {
               break;
-            }
+            }*/
           } 
           var leftTextUrl  = s.anchorNode;
@@ -255 +256 @@
 
             var m = s.anchorNode.data.match(Xinha.RE_url);
-            if ( m && a.href.match(s.anchorNode.data.trim()) )
+                        
+            if ( m && a.href.match(new RegExp( 'http(s)?://' + Xinha.escapeStringForRegExp( s.anchorNode.data.trim() ) ) ) )
             {
               var txtNode = s.anchorNode;
@@ -261 +263 @@
               {
                 // Sometimes m is undefined becase the url is not an url anymore (was www.url.com and become for example www.url)
+                                // ray: shouldn't the link be un-linked then?
                 m = txtNode.data.match(Xinha.RE_url);
                 if(m)