Merge VS Code 1.31.1 (#4283)

This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions

View File

@@ -24,7 +24,7 @@ export class QuickInputBox {
private parent: HTMLElement
) {
this.container = dom.append(this.parent, $('.quick-input-box'));
this.inputBox = new InputBox(this.container, null);
this.inputBox = new InputBox(this.container, undefined);
this.disposables.push(this.inputBox);
}
@@ -55,7 +55,7 @@ export class QuickInputBox {
}
get placeholder() {
return this.inputBox.inputElement.getAttribute('placeholder');
return this.inputBox.inputElement.getAttribute('placeholder') || '';
}
set placeholder(placeholder: string) {