From 85d47a74cbaf9ee6afbe4f6cdc527c0feae19699 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 28 Feb 2018 11:44:30 -0800 Subject: [PATCH] Fix webviews not restoring html properly --- src/vs/workbench/api/electron-browser/mainThreadWebview.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts index 71606a9b7d6..52fbb2f289c 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts @@ -49,6 +49,7 @@ class WebviewInput extends EditorInput { private _name: string; private _options: vscode.WebviewOptions; private _html: string; + private _currentWebviewHtml: string = ''; private _events: WebviewEvents | undefined; private _container: HTMLElement; private _webview: Webview | undefined; @@ -56,6 +57,7 @@ class WebviewInput extends EditorInput { private _webviewDisposables: IDisposable[] = []; private _position: Position; + public static create( resource: URI, name: string, @@ -138,7 +140,7 @@ class WebviewInput extends EditorInput { } public setHtml(value: string): void { - if (value === this._html) { + if (value === this._currentWebviewHtml) { return; } @@ -146,6 +148,7 @@ class WebviewInput extends EditorInput { if (this._webview) { this._webview.contents = value; + this._currentWebviewHtml = value; } } @@ -218,7 +221,7 @@ class WebviewInput extends EditorInput { this._webviewOwner = undefined; this.container.style.visibility = 'hidden'; - this._html = ''; + this._currentWebviewHtml = ''; } public onDidChangePosition(position: Position) {