Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb (#4663)

This commit is contained in:
Anthony Dresser
2019-03-22 13:07:54 -07:00
committed by GitHub
parent f5c9174c2f
commit 4a87a24235
296 changed files with 2531 additions and 2472 deletions

View File

@@ -118,7 +118,7 @@ export class ContextView extends Disposable {
this._register(toDisposable(() => this.setContainer(null)));
}
public setContainer(container: HTMLElement | null): void {
setContainer(container: HTMLElement | null): void {
if (this.container) {
this.toDisposeOnSetContainer = dispose(this.toDisposeOnSetContainer);
this.container.removeChild(this.view);
@@ -146,7 +146,7 @@ export class ContextView extends Disposable {
}
}
public show(delegate: IDelegate): void {
show(delegate: IDelegate): void {
if (this.isVisible()) {
this.hide();
}
@@ -173,7 +173,7 @@ export class ContextView extends Disposable {
}
}
public layout(): void {
layout(): void {
if (!this.isVisible()) {
return;
}
@@ -258,7 +258,7 @@ export class ContextView extends Disposable {
this.view.style.width = 'initial';
}
public hide(data?: any): void {
hide(data?: any): void {
if (this.delegate && this.delegate.onHide) {
this.delegate.onHide(data);
}
@@ -288,7 +288,7 @@ export class ContextView extends Disposable {
}
}
public dispose(): void {
dispose(): void {
this.hide();
super.dispose();