Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 351545 Junk mail doesn't work in Global Inbox r=Mnyromyr sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@213001 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk
2006-10-02 16:05:03 +00:00
parent 93580864e0
commit ddfb67eeda
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/mailnews/base/prefs/resources/content/am-junk.js
View File

@@ -45,10 +45,24 @@ function onInit()
document.getElementById('spamLevel').checked =
document.getElementById('server.spamLevel').value > 0;
SetFolderPicker(document.getElementById('server.spamActionTargetAccount').value,
'actionTargetAccount');
SetFolderPicker(document.getElementById('server.spamActionTargetFolder').value,
'actionTargetFolder');
var spamActionTargetAccount = document.getElementById('server.spamActionTargetAccount').value;
if (!spamActionTargetAccount)
{
var server = GetMsgFolderFromUri(parent.pendingServerId, false).server;
if (server.canCreateFoldersOnServer && server.canSearchMessages)
spamActionTargetAccount = parent.pendingServerId;
else
spamActionTargetAccount = parent.accountManager.localFoldersServer.serverURI;
document.getElementById('server.spamActionTargetAccount').value = spamActionTargetAccount;
}
SetFolderPicker(spamActionTargetAccount, 'actionTargetAccount');
var spamActionTargetFolder = document.getElementById('server.spamActionTargetFolder').value;
if (!spamActionTargetFolder)
{
spamActionTargetFolder = parent.accountManager.localFoldersServer.serverURI + "/Junk";
document.getElementById('server.spamActionTargetFolder').value = spamActionTargetFolder;
}
SetFolderPicker(spamActionTargetFolder, 'actionTargetFolder');
// set up the whitelist UI
document.getElementById("whiteListAbURI").value =

1
mozilla/mailnews/base/prefs/resources/content/am-junk.xul
View File

@@ -52,6 +52,7 @@
onload="parent.onPanelLoaded('am-junk.xul');">
<script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/am-junk.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>