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

Merge VS Code 1.21 source code (#1067)

Browse Source 
* 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:
Karl Burtram
2018-04-04 15:27:51 -07:00
committed by GitHub
parent 5fba3e31b4
commit dafb780987
9412 changed files with 141255 additions and 98813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/base/browser/ui/inputbox/inputBox.ts
View File

@@ -29,7 +29,7 @@ export interface IInputOptions extends IInputBoxStyles {
flexibleHeight?: boolean;
actions?: IAction[];
// {{SQL CARBON EDIT}} Canidate for addition to vscode
// {{SQL CARBON EDIT}} Candidate for addition to vscode
min?: string;
}
@@ -139,7 +139,7 @@ export class InputBox extends Widget {
if (this.options.validationOptions) {
this.validation = this.options.validationOptions.validation;
// {{SQL CARBON EDIT}} Canidate for addition to vscode
// {{SQL CARBON EDIT}} Candidate for addition to vscode
this.showValidationMessage = true;
}
@@ -173,8 +173,7 @@ export class InputBox extends Widget {
}
if (this.placeholder) {
this.input.setAttribute('placeholder', this.placeholder);
this.input.title = this.placeholder;
this.setPlaceHolder(this.placeholder);
}
this.oninput(this.input, () => this.onValueChange());
@@ -201,7 +200,7 @@ export class InputBox extends Widget {
if (this.options.actions) {
this.actionbar = this._register(new ActionBar(this.element));
this.actionbar.push(this.options.actions, { icon: true, label: false });
// {{SQL CARBON EDIT}} Canidate for addition to vscode
// {{SQL CARBON EDIT}} Candidate for addition to vscode
this.input.style.paddingRight = (this.options.actions.length * 22) + 'px';
}
@@ -219,6 +218,7 @@ export class InputBox extends Widget {
public setPlaceHolder(placeHolder: string): void {
if (this.input) {
this.input.setAttribute('placeholder', placeHolder);
this.input.title = placeHolder;
}
}
@@ -378,7 +378,7 @@ export class InputBox extends Widget {
}
private _showMessage(): void {
// {{SQL CARBON EDIT}} Canidate for addition to vscode
// {{SQL CARBON EDIT}} Candidate for addition to vscode
if (!this.contextViewProvider || !this.message || !this.showValidationMessage) {
return;
}