Fix potential race detecting image load

11c45172 · Matt Bierner · 7aff0c42 · 11c45172 · 11c45172
隐藏空白更改
内联并排

Showing with 8 addition and 4 deletion

extensions/image-preview/media/main.js extensions/image-preview/media/main.js +6 -2

extensions/image-preview/src/preview.ts extensions/image-preview/src/preview.ts +2 -2

未找到文件。
--- a/extensions/image-preview/media/main.js
+++ b/extensions/image-preview/media/main.js
@@ -58,7 +58,8 @@
 		20
 	];

-	const isMac = getSettings().isMac;
+	const settings = getSettings();
+	const isMac = settings.isMac;

 	const vscode = acquireVsCodeApi();

@@ -71,7 +72,7 @@

 	// Elements
 	const container =  /** @type {HTMLElement} */(document.querySelector('body'));
-	const image = document.querySelector('img');
+	const image = document.createElement('img');

 	function updateScale(newScale) {
 		if (!image || !image.parentElement) {
@@ -248,6 +249,9 @@
 		}
 	});

+	image.src = decodeURI(settings.src);
+	document.body.append(image);
+
 	window.addEventListener('message', e => {
 		switch (e.data.type) {
 			case 'setScale':

--- a/extensions/image-preview/src/preview.ts
+++ b/extensions/image-preview/src/preview.ts
@@ -80,7 +80,8 @@ export class Preview extends Disposable {

 	private getWebiewContents(webviewEditor: vscode.WebviewEditor, resource: vscode.Uri): string {
 		const settings = {
-			isMac: process.platform === 'darwin'
+			isMac: process.platform === 'darwin',
+			src: encodeURI(webviewEditor.webview.asWebviewUri(resource).toString(true))
 		};

 		return /* html */`<!DOCTYPE html>
@@ -95,7 +96,6 @@ export class Preview extends Disposable {
 	<meta id="image-preview-settings" data-settings="${escapeAttribute(JSON.stringify(settings))}">
 </head>
 <body class="container image scale-to-fit">
-	<img src="${escapeAttribute(webviewEditor.webview.asWebviewUri(resource))}">
 	<script src="${escapeAttribute(this.extensionResource('/media/main.js'))}"></script>
 </body>
 </html>`;