Ticket #2488: 2488.patch
File 2488.patch, 1.7 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
62 62 now are shown properly.</li> 63 63 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using the Paste 64 64 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> 65 68 </ul> 66 69 <p> 67 70 <a href="_whatsnew_history.html">See previous versions history</a></p> -
editor/dialog/fck_link/fck_link.js
194 194 } 195 195 196 196 // 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,]+\))\+'(.*)'\)?$/ ) ; 198 198 if ( aMatch ) 199 199 { 200 200 // The link is encoded … … 253 253 for ( var i = 0 ; i < address.length ; i++ ) 254 254 aAddressCode.push( address.charCodeAt( i ) ) ; 255 255 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( '&' ) + '\')' ; 257 257 } 258 258 259 259 // EMailProtection 'none'