ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix wizard page name and step getting announced when pages are added and removed (#13362)

Browse Source
This commit is contained in:
Kim Santiago
2020-11-12 09:44:33 -08:00
committed by GitHub
parent 07df54ee61
commit abdf575885
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/workbench/services/dialog/browser/wizardModal.ts
View File

@@ -138,13 +138,13 @@ export class WizardModal extends Modal {
this._wizard.onPageAdded(page => { this._wizard.onPageAdded(page => {
this.registerPage(page); this.registerPage(page);
this.updatePageNumbers(); this.updatePageNumbers();
this.showPage(this._wizard.currentPage, false).catch(err => onUnexpectedError(err)); this.showPage(this._wizard.currentPage, false, false, false).catch(err => onUnexpectedError(err));
}); });
this._wizard.onPageRemoved(page => { this._wizard.onPageRemoved(page => {
let dialogPane = this._dialogPanes.get(page); let dialogPane = this._dialogPanes.get(page);
this._dialogPanes.delete(page); this._dialogPanes.delete(page);
this.updatePageNumbers(); this.updatePageNumbers();
this.showPage(this._wizard.currentPage, false).catch(err => onUnexpectedError(err)); this.showPage(this._wizard.currentPage, false, false, false).catch(err => onUnexpectedError(err));
dialogPane.dispose(); dialogPane.dispose();
}); });
this.updatePageNumbers(); this.updatePageNumbers();
@@ -173,7 +173,7 @@ export class WizardModal extends Modal {
page.onUpdate(() => this.setButtonsForPage(this._wizard.currentPage)); page.onUpdate(() => this.setButtonsForPage(this._wizard.currentPage));
} }
public async showPage(index: number, validate: boolean = true, focus: boolean = false): Promise<void> { public async showPage(index: number, validate: boolean = true, focus: boolean = false, readHeader: boolean = true): Promise<void> {
let pageToShow = this._wizard.pages[index]; let pageToShow = this._wizard.pages[index];
if (!pageToShow) { if (!pageToShow) {
this.done(validate).catch(err => onUnexpectedError(err)); this.done(validate).catch(err => onUnexpectedError(err));
@@ -194,7 +194,7 @@ export class WizardModal extends Modal {
} }
}); });
if (dialogPaneToShow) { if (dialogPaneToShow && readHeader) {
status(`${dialogPaneToShow.pageNumberDisplayText} ${dialogPaneToShow.title}`); status(`${dialogPaneToShow.pageNumberDisplayText} ${dialogPaneToShow.title}`);
} }
this.setButtonsForPage(index); this.setButtonsForPage(index);