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

Bug 256536 Auto-subscribe (news) URLS should NOT prompt for account type

Browse Source 
p=me/kteuscher r=neil.parkwaycc.co.uk sr=bienvenu


git-svn-id: svn://10.0.0.236/trunk@162890 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%arlen.demon.co.uk 2004-09-28 20:23:06 +00:00
parent 70dcc48bae
commit 22e2dc4f46
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/mailnews/base/prefs/resources/content/AccountWizard.js
View File

@ -126,11 +126,6 @@ function onAccountWizardLoad() {
checkForInvalidAccounts();
if (gCurrentAccount) {
// Set the page index to identity page.
document.documentElement.pageIndex = 1;
}
try {
gDefaultAccount = am.defaultAccount;
}
@ -778,6 +773,10 @@ function checkForInvalidAccounts()
AccountDataToPageData(accountData, pageData);
gCurrentAccountData = accountData;
setupWizardPanels();
// Set the page index to identity page.
document.documentElement.pageIndex = 1;
}
}

8
mozilla/mailnews/base/prefs/resources/content/aw-accounttype.js
View File

@ -51,7 +51,11 @@ function acctTypePageUnload() {
gCurrentAccountData = null;
setAccountTypeData();
initializeIspData();
setupWizardPanels();
return true;
}
function setupWizardPanels() {
if (gCurrentAccountData && gCurrentAccountData.useOverlayPanels) {
if ("testingIspServices" in this) {
if ("SetPageMappings" in this && testingIspServices()) {
@ -105,8 +109,6 @@ function acctTypePageUnload() {
// make the account type page go to the very first of our approved wizard panels...this is usually going to
// be accounttype --> identitypage unless we were configured to skip the identity page
setNextPage("accounttype",wizardPanels[0]);
return true;
}
function initializeIspData()

4
mozilla/toolkit/content/widgets/wizard.xml
View File

@ -95,7 +95,9 @@
if (val < 0 || val >= this.pageCount)
return this._pageIndex;
this.currentPage = this.wizardPages[val];
var page = this.wizardPages[val];
this._pageStack[this._pageStack.length-1] = page;
this.currentPage = page;
]]>
</setter>
</property>

4
mozilla/xpfe/global/resources/content/bindings/wizard.xml
View File

@ -97,7 +97,9 @@
if (val < 0 || val >= this.pageCount)
return this._pageIndex;
this.currentPage = this.wizardPages[val];
var page = this.wizardPages[val];
this._pageStack[this._pageStack.length-1] = page;
this.currentPage = page;
]]>
</setter>
</property>