LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge of '06779f0bbfe40e7611b69790cf2eff4809382438'

Browse source 
and 'a92e5913badf5a71e06b1253bb3137e83d7ad34e'

Monotone-Parent: 06779f0bbfe40e7611b69790cf2eff4809382438
Monotone-Parent: a92e5913badf5a71e06b1253bb3137e83d7ad34e
Monotone-Revision: 64282771e1fb25846e93ccef41b7198b11c569f6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-06-07T14:03:43
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2011-06-07 14:03:43 +00:00
parent 2974a91c5e 71f92289d2
commit 7329498b8b
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -30,6 +30,12 @@
as parameter.
(-deleteMessageWithMID:inFID:withFlags:): same as above.
2011-06-06 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (configureLinksInMessage):
when a link has the attribute moz-do-not-send set to true, remove
it and force a new mailto href.
2011-06-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/SOGoMAPIFSFolder.m (-creationTime)

21
UI/WebServerResources/MailerUI.js
View file

@ -1319,13 +1319,21 @@ function configureLinksInMessage() {
mailContentDiv.observe("contextmenu", onMessageContentMenu);
var anchors = messageDiv.getElementsByTagName('a');
for (var i = 0; i < anchors.length; i++)
if (anchors[i].href.substring(0,7) == "mailto:") {
$(anchors[i]).observe("click", onEmailTo);
$(anchors[i]).observe("contextmenu", onEmailAddressClick);
for (var i = 0; i < anchors.length; i++) {
var anchor = $(anchors[i]);
if (!anchor.href && anchor.readAttribute("moz-do-not-send")) {
anchor.writeAttribute("moz-do-not-send", false);
anchor.removeClassName("moz-txt-link-abbreviated");
anchor.href = "mailto:" + anchors[i].innerHTML;
}
if (anchor.href.substring(0,7) == "mailto:") {
anchor.observe("click", onEmailTo);
anchor.observe("contextmenu", onEmailAddressClick);
anchor.writeAttribute("moz-do-not-send", false);
}
else
$(anchors[i]).observe("click", onMessageAnchorClick);
anchor.observe("click", onMessageAnchorClick);
}
var attachments = messageDiv.select ("DIV.linked_attachment_body");
for (var i = 0; i < attachments.length; i++)
@ -1565,7 +1573,8 @@ function onEmailAddressClick(event) {
}
function onMessageAnchorClick(event) {
window.open(this.href);
if (this.href)
window.open(this.href);
preventDefault(event);
}