Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #298525 --> phishing state should take precedence over junk state in the message bar. sr=bienvenu

Browse Source
This commit is contained in:
scott%scott-macgregor.org 2006-03-10 04:15:45 +00:00
parent 33e9375ed4
commit 01367db66d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mail/base/content/mailWindowOverlay.js
View File

@ -2184,7 +2184,9 @@ var gMessageNotificationBar =
isJunk = ((junkScore != "") && (junkScore != "0"));
}
this.updateMsgNotificationBar (isJunk ? kMsgNotificationJunkBar : kMsgNotificationNoStatus);
// phishing scams take precedence over junk
if (this.mMsgNotificationBar.selectedIndex != kMsgNotificationPhishingBar && isJunk)
this.updateMsgNotificationBar (kMsgNotificationJunkBar);
goUpdateCommand('button_junk');
@ -2193,9 +2195,8 @@ var gMessageNotificationBar =
setRemoteContentMsg: function (aMsgHdr)
{
// The phishing message and junk message takes precedence over the remote content msg
if (this.mMsgNotificationBar.selectedIndex != kMsgNotificationJunkBar &&
this.mMsgNotificationBar.selectedIndex != kMsgNotificationPhishingBar)
// phishing and junk messages take precedence over the remote content msg...
if (this.mMsgNotificationBar.selectedIndex == kMsgNotificationNoStatus)
this.updateMsgNotificationBar(aMsgHdr && aMsgHdr.getUint32Property("remoteContentPolicy") == kBlockRemoteContent ?
kMsgNotificationRemoteImages : kMsgNotificationNoStatus);
},
@ -2213,9 +2214,8 @@ var gMessageNotificationBar =
return;
}
// The Junk message takes precedence over the phishing message...so skip this step
// if the message is already marked as junk
if (this.mMsgNotificationBar.selectedIndex != kMsgNotificationJunkBar && isMsgEmailScam(aUrl))
// phishing scams take precedence over junk and remote images.
if (isMsgEmailScam(aUrl))
this.updateMsgNotificationBar(kMsgNotificationPhishingBar);
},