mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-17 01:25:36 -05:00
Merge VS Code 1.21 source code (#1067)
* Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms
This commit is contained in:
@@ -75,7 +75,7 @@ export class ErrorMessageDialog extends Modal {
|
||||
let copyButtonLabel = localize('copyDetails', 'Copy details');
|
||||
this._copyButton = this.addFooterButton(copyButtonLabel, () => this._clipboardService.writeText(this._messageDetails), 'left');
|
||||
this._copyButton.icon = 'icon scriptToClipboard';
|
||||
this._copyButton.getElement().title = copyButtonLabel;
|
||||
this._copyButton.element.title = copyButtonLabel;
|
||||
this._register(attachButtonStyler(this._copyButton, this._themeService, { buttonBackground: SIDE_BAR_BACKGROUND, buttonHoverBackground: SIDE_BAR_BACKGROUND }));
|
||||
}
|
||||
|
||||
@@ -144,9 +144,9 @@ export class ErrorMessageDialog extends Modal {
|
||||
this.title = headerTitle;
|
||||
this._messageDetails = messageDetails;
|
||||
if (this._messageDetails) {
|
||||
this._copyButton.getElement().style.visibility = 'visible';
|
||||
this._copyButton.element.style.visibility = 'visible';
|
||||
} else {
|
||||
this._copyButton.getElement().style.visibility = 'hidden';
|
||||
this._copyButton.element.style.visibility = 'hidden';
|
||||
}
|
||||
this.resetActions();
|
||||
if (actions && actions.length > 0) {
|
||||
@@ -154,7 +154,7 @@ export class ErrorMessageDialog extends Modal {
|
||||
this._actions.push(actions[i]);
|
||||
let button = this._actionButtons[i];
|
||||
button.label = actions[i].label;
|
||||
button.getElement().style.visibility = 'visible';
|
||||
button.element.style.visibility = 'visible';
|
||||
}
|
||||
this._okButton.label = this._closeLabel;
|
||||
} else {
|
||||
@@ -169,7 +169,7 @@ export class ErrorMessageDialog extends Modal {
|
||||
private resetActions(): void {
|
||||
this._actions = [];
|
||||
for(let actionButton of this._actionButtons) {
|
||||
actionButton.getElement().style.visibility = 'hidden';
|
||||
actionButton.element.style.visibility = 'hidden';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user