ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 17:22:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

Browse Source
This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/browser/modal/dialogHelper.ts
View File

@@ -5,7 +5,7 @@
import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
import { Button } from 'sql/base/browser/ui/button/button';
import { append, $, addClass, addClasses } from 'vs/base/browser/dom';
import { append, $ } from 'vs/base/browser/dom';
import * as types from 'vs/base/common/types';
@@ -15,9 +15,9 @@ export function appendRow(container: HTMLElement, label: string, labelClass: str
let rowContainer = append(container, $('tr'));
if (rowContainerClass) {
if (types.isString(rowContainerClass)) {
addClass(rowContainer, rowContainerClass);
rowContainer.classList.add(rowContainerClass);
} else {
addClasses(rowContainer, ...rowContainerClass);
rowContainer.classList.add(...rowContainerClass);
}
}
const labelContainer = append(append(rowContainer, $(`td.${labelClass}`)), $('div.dialog-label-container'));

16
src/sql/workbench/browser/modal/modal.ts
View File

@@ -161,7 +161,7 @@ export abstract class Modal extends Disposable implements IThemable {
* (hyoshi - 10/2/2017 tracked by https://github.com/Microsoft/carbon/issues/1836)
*/
public setWide(isWide: boolean): void {
DOM.toggleClass(this._bodyContainer!, 'wide', isWide);
this._bodyContainer!.classList.toggle('wide', isWide);
}
/**
@@ -356,18 +356,18 @@ export abstract class Modal extends Disposable implements IThemable {
if (this.shouldShowExpandMessageButton) {
DOM.append(this._detailsButtonContainer!, this._toggleMessageDetailButton!.element);
} else {
DOM.removeNode(this._toggleMessageDetailButton!.element);
this._toggleMessageDetailButton!.element.remove();
}
}
private toggleMessageDetail() {
const isExpanded = DOM.hasClass(this._messageSummary!, MESSAGE_EXPANDED_MODE_CLASS);
DOM.toggleClass(this._messageSummary!, MESSAGE_EXPANDED_MODE_CLASS, !isExpanded);
const isExpanded = this._messageSummary!.classList.contains(MESSAGE_EXPANDED_MODE_CLASS);
this._messageSummary!.classList.toggle(MESSAGE_EXPANDED_MODE_CLASS, !isExpanded);
this._toggleMessageDetailButton!.label = isExpanded ? SHOW_DETAILS_TEXT : localize('hideMessageDetails', "Hide Details");
if (this._messageDetailText) {
if (isExpanded) {
DOM.removeNode(this._messageDetail!);
this._messageDetail!.remove();
} else {
DOM.append(this._messageBody!, this._messageDetail!);
}
@@ -576,8 +576,8 @@ export abstract class Modal extends Disposable implements IThemable {
severityText = WARNING_ALT_TEXT;
}
levelClasses.forEach(level => {
DOM.toggleClass(this._messageIcon!, level, selectedLevel === level);
DOM.toggleClass(this._messageElement!, level, selectedLevel === level);
this._messageIcon!.classList.toggle(level, selectedLevel === level);
this._messageElement!.classList.toggle(level, selectedLevel === level);
});
this._messageIcon!.title = severityText;
@@ -586,7 +586,7 @@ export abstract class Modal extends Disposable implements IThemable {
this._messageSummary!.title = message!;
this._messageDetail!.innerText = description;
}
DOM.removeNode(this._messageDetail!);
this._messageDetail!.remove();
this.messagesElementVisible = !!this._messageSummaryText;
// Read out the description to screen readers so they don't have to
// search around for the alert box to hear the extra information