refactor panel.webview.html content

denco · denco · commit e79e94e5a378 · 2019-11-14T22:13:10.000+01:00
diff --git a/src/ConfluenceContentProvider.ts b/src/ConfluenceContentProvider.ts
@@ -3,7 +3,7 @@
 // Import the module and reference it with the alias vscode in your code below
 import * as vscode from 'vscode';
 
-import { parseMarkup, cssUri } from './markupParser';
+import {parseMarkup} from './markupParser';
 
 export function packConfluenceUri(uri: vscode.Uri) {
 	// Temporarily change the URI scheme
@@ -40,24 +40,10 @@ export class ConfluenceContentProvider implements vscode.TextDocumentContentProv
 	}
 
 	public async provideTextDocumentContent(uri: vscode.Uri): Promise<string> {
-		let document = await vscode.workspace.openTextDocument(unpackConfluenceUri(uri));
-		let body = await parseMarkup(unpackConfluenceUri(uri), document.getText());
-		let cssLink = cssUri("confluence.css");
+		const document = await vscode.workspace.openTextDocument(unpackConfluenceUri(uri));
+		const body = await parseMarkup(unpackConfluenceUri(uri), document.getText());
 
-
-		// Security
-		// https://code.visualstudio.com/api/extension-guides/webview#security
-		return `<!DOCTYPE html>
-			<html>
-			<head>
-				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'self' 'unsafe-inline'; img-src vscode-resource: https:; script-src vscode-resource:; style-src vscode-resource:;"/>
-				<link rel="stylesheet" href="${cssLink}">
-			</head>
-			<body>
-				${body}
-			</body>
-			</html>`;
+		return body
 	}
 
 	get onDidChange(): vscode.Event<vscode.Uri> {
diff --git a/src/extension.ts b/src/extension.ts
@@ -7,9 +7,37 @@ import { packConfluenceUri, unpackConfluenceUri, ConfluenceContentProvider } fro
 
 const path = require('path');
 
+import {cssUri} from './markupParser';
+
+
 function getRenderedContent(contentProvider: ConfluenceContentProvider, uri: vscode.Uri, panel: vscode.WebviewPanel) {
 	contentProvider.provideTextDocumentContent(packConfluenceUri(uri)).then((renderedContent) => {
-		panel.webview.html = renderedContent;
+		// Security
+		// https://code.visualstudio.com/api/extension-guides/webview#security
+
+		const cssFile = cssUri('confluence.css')
+		let cssLink = ""
+		if (cssFile) {
+			const cssUrl = panel.webview.asWebviewUri(cssFile)
+			cssLink = `<link rel="stylesheet" href="${cssUrl}">`
+		}
+
+		panel.webview.html = `<!DOCTYPE html>
+			<html>
+			<head>
+				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+				<meta name="viewport" content="width=device-width, initial-scale=1.0">
+				<meta http-equiv="Content-Security-Policy"
+					content="default-src 'none';
+					img-src self vscode-resource: https:;
+					script-src self vscode-resource:;
+					style-src 'unsafe-inline' self vscode-resource:;"/>
+				${cssLink}
+			</head>
+			<body>
+				${renderedContent}
+			</body>
+			</html>`;
 	}, (reason) => {
 		vscode.window.showErrorMessage(reason);
 	});
