Ticket #2488: 2488.patch

_whatsnew.html

@@ -62 +62 @@
                         now are shown properly.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using the Paste
                         dialogs in IE might insert the content at the start of the editor.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2488">#2488</a>] Fixed the issue
+                        where email links in IE would take the browser to a new page in addition to calling up the
+                        email client.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>

editor/dialog/fck_link/fck_link.js

@@ -194 +194 @@
                 }
 
                 // Try to match the email against the encode protection.
-                var aMatch = aLinkInfo[2].match( /^location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'$/ ) ;
+                var aMatch = aLinkInfo[2].match( /^(?:void\()?location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'\)?$/ ) ;
                 if ( aMatch )
                 {
                         // The link is encoded
@@ -253 +253 @@
                         for ( var i = 0 ; i < address.length ; i++ )
                                 aAddressCode.push( address.charCodeAt( i ) ) ;
 
-                        return 'javascript:location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\'' ;
+                        return 'javascript:void(location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\')' ;
         }
 
         // EMailProtection 'none'