Ticket #2488: 2488.patch

File 2488.patch, 1.7 KB (added by Martin Kou, 11 years ago)
  • _whatsnew.html

     
    6262                        now are shown properly.</li>
    6363                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using the Paste
    6464                        dialogs in IE might insert the content at the start of the editor.</li>
     65                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2488">#2488</a>] Fixed the issue
     66                        where email links in IE would take the browser to a new page in addition to calling up the
     67                        email client.</li>
    6568        </ul>
    6669        <p>
    6770                <a href="_whatsnew_history.html">See previous versions history</a></p>
  • editor/dialog/fck_link/fck_link.js

     
    194194                }
    195195
    196196                // Try to match the email against the encode protection.
    197                 var aMatch = aLinkInfo[2].match( /^location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'$/ ) ;
     197                var aMatch = aLinkInfo[2].match( /^(?:void\()?location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'\)?$/ ) ;
    198198                if ( aMatch )
    199199                {
    200200                        // The link is encoded
     
    253253                        for ( var i = 0 ; i < address.length ; i++ )
    254254                                aAddressCode.push( address.charCodeAt( i ) ) ;
    255255
    256                         return 'javascript:location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\'' ;
     256                        return 'javascript:void(location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\')' ;
    257257        }
    258258
    259259        // EMailProtection 'none'
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy