From ecb1a65b5c489524427548dba9a0a92725b3453c Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 18 Jun 2019 14:09:46 -0700 Subject: [PATCH] :lipstick: --- .../contrib/webview/browser/pre/service-worker.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/contrib/webview/browser/pre/service-worker.js b/src/vs/workbench/contrib/webview/browser/pre/service-worker.js index 9ea84924ea3..6c28c8ea02f 100644 --- a/src/vs/workbench/contrib/webview/browser/pre/service-worker.js +++ b/src/vs/workbench/contrib/webview/browser/pre/service-worker.js @@ -8,7 +8,10 @@ const resourceRoot = '/vscode-resource'; /** - * @typedef {{resolve: () => void, promise: Promise }} ResourcePathEntry + * @typedef {{ + * resolve: () => void, + * promise: Promise + * }} ResourcePathEntry */ /** @@ -105,17 +108,14 @@ self.addEventListener('fetch', (event) => { const webviewId = getWebviewIdForClient(client); const resourcePath = requestUrl.pathname.replace(resourceRoot, ''); + const allClients = await self.clients.matchAll({ includeUncontrolled: true }); + + // Check if we've already resolved this request const existing = resourceRequestManager.get(webviewId, resourcePath); if (existing) { return existing.promise.then(r => r.clone()); } - const allClients = await self.clients.matchAll({ includeUncontrolled: true }); - if (resourceRequestManager.has(webviewId, resourcePath)) { - // Someone else added it in the meantime - return resourceRequestManager.get(resourceRequestManager).promise.then(r => r.clone()); - } - // Find parent iframe for (const client of allClients) { const clientUrl = new URL(client.url); -- GitLab