diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts index ae51d1a4655..f6a2c26d62f 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts @@ -209,7 +209,7 @@ class WebviewEditor extends BaseWebviewEditor { allowScripts: input.options.enableScripts, enableWrappedPostMessage: true }; - this.webview.contents = [input.html]; + this.webview.contents = input.html; this.webview.style(this.themeService.getTheme()); } diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts index a0566ec09fc..f1d09a11784 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts @@ -426,7 +426,7 @@ export class ExtensionEditor extends BaseEditor { this.contentDisposables.push(toDisposable(removeLayoutParticipant)); this.activeWebview.style(this.themeService.getTheme()); - this.activeWebview.contents = [body]; + this.activeWebview.contents = body; this.activeWebview.onDidClickLink(link => { // Whitelist supported schemes for links diff --git a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts index 06925da8b84..24cab9977cf 100644 --- a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts +++ b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts @@ -143,8 +143,8 @@ export class HtmlPreviewPart extends WebviewEditor { this._themeChangeSubscription = this.themeService.onThemeChange(this.onThemeChange.bind(this)); if (this._hasValidModel()) { - this._modelChangeSubscription = this.model.onDidChangeContent(() => this.webview.contents = this.model.getLinesContent()); - this.webview.contents = this.model.getLinesContent(); + this._modelChangeSubscription = this.model.onDidChangeContent(() => this.webview.contents = this.model.getLinesContent().join('\n')); + this.webview.contents = this.model.getLinesContent().join('\n'); } } } @@ -234,14 +234,14 @@ export class HtmlPreviewPart extends WebviewEditor { this._modelChangeSubscription = this.model.onDidChangeContent(() => { if (this.model) { this.scrollYPercentage = 0; - this.webview.contents = this.model.getLinesContent(); + this.webview.contents = this.model.getLinesContent().join('\n'); } }); const state = this.loadViewState(resourceUri); this.scrollYPercentage = state ? state.scrollYPercentage : 0; this.webview.baseUrl = resourceUri.toString(true); this.webview.options = input.options; - this.webview.contents = this.model.getLinesContent(); + this.webview.contents = this.model.getLinesContent().join('\n'); this.webview.initialScrollProgress = this.scrollYPercentage; return undefined; }); diff --git a/src/vs/workbench/parts/html/browser/webview-pre.js b/src/vs/workbench/parts/html/browser/webview-pre.js index ed6c1fc5da8..3f83e84fdb7 100644 --- a/src/vs/workbench/parts/html/browser/webview-pre.js +++ b/src/vs/workbench/parts/html/browser/webview-pre.js @@ -128,7 +128,7 @@ const options = data.options; enableWrappedPostMessage = options && options.enableWrappedPostMessage; - const text = data.contents.join('\n'); + const text = data.contents; const newDocument = new DOMParser().parseFromString(text, 'text/html'); newDocument.querySelectorAll('a').forEach(a => { diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts index 8c4771cbfaf..ccdf4298b60 100644 --- a/src/vs/workbench/parts/html/browser/webview.ts +++ b/src/vs/workbench/parts/html/browser/webview.ts @@ -284,7 +284,7 @@ export default class Webview { this._options = value; } - set contents(value: string[]) { + set contents(value: string) { this._send('content', { contents: value, options: this._options diff --git a/src/vs/workbench/parts/html/browser/webviewEditor.ts b/src/vs/workbench/parts/html/browser/webviewEditor.ts index f1c7a42e68e..f5c289d3928 100644 --- a/src/vs/workbench/parts/html/browser/webviewEditor.ts +++ b/src/vs/workbench/parts/html/browser/webviewEditor.ts @@ -24,10 +24,6 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { Action } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; -export interface HtmlPreviewEditorViewState { - scrollYPercentage: number; -} - /** A context key that is set when a webview editor has focus. */ export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS = new RawContextKey('webviewEditorFocus', false); /** A context key that is set when the find widget find input in webview editor webview is focused. */ diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts index ace4d2f79fd..557d912273f 100644 --- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts +++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts @@ -124,7 +124,7 @@ export class ReleaseNotesEditor extends WebviewEditor { } } this.onThemeChange(this.themeService.getTheme()); - this._webview.contents = [body]; + this._webview.contents = body; this._webview.onDidClickLink(link => { addGAParameters(this.telemetryService, this.environmentService, link, 'ReleaseNotes')