maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleaning up check if service workers are supported or not

Browse source
This commit is contained in:
Matt Bierner 2019-07-01 15:01:03 -07:00
parent 35f77aab43
commit be5be44689
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vs/workbench/contrib/webview/browser/pre/host.js
View file

@ -36,11 +36,8 @@
}(); }();
const workerReady = new Promise(async (resolveWorkerReady) => { const workerReady = new Promise(async (resolveWorkerReady) => {
try { if (!areServiceWorkersEnabled()) {
if (!navigator.serviceWorker) { console.log('Service Workers are not enabled. Webviews will not work properly');
return resolveWorkerReady();
}
} catch (e) {
return resolveWorkerReady(); return resolveWorkerReady();
} }
@ -85,9 +82,18 @@
}); });
}); });
function areServiceWorkersEnabled() {
try {
return !!navigator.serviceWorker;
} catch (e) {
return false;
}
}
window.createWebviewManager({ window.createWebviewManager({
postMessage: hostMessaging.postMessage.bind(hostMessaging), postMessage: hostMessaging.postMessage.bind(hostMessaging),
onMessage: hostMessaging.onMessage.bind(hostMessaging), onMessage: hostMessaging.onMessage.bind(hostMessaging),
ready: workerReady, ready: workerReady,
fakeLoad: true
}); });
}()); }());

24
src/vs/workbench/contrib/webview/browser/pre/main.js
View file

@ -10,7 +10,8 @@
* onMessage: (channel: string, handler: any) => void, * onMessage: (channel: string, handler: any) => void,
* focusIframeOnCreate?: boolean, * focusIframeOnCreate?: boolean,
* ready?: Promise<void>, * ready?: Promise<void>,
* onIframeLoaded: (iframe: HTMLIFrameElement) => void * onIframeLoaded?: (iframe: HTMLIFrameElement) => void,
* fakeLoad: boolean
* }} WebviewHost * }} WebviewHost
*/ */
@ -157,13 +158,6 @@
initialScrollProgress: undefined initialScrollProgress: undefined
}; };
// Service worker for resource loading
let FAKE_LOAD = false;
try {
FAKE_LOAD = !!navigator.serviceWorker;
} catch (e) {
// noop
}
/** /**
* @param {HTMLDocument?} document * @param {HTMLDocument?} document
@ -368,7 +362,7 @@
newFrame.setAttribute('id', 'pending-frame'); newFrame.setAttribute('id', 'pending-frame');
newFrame.setAttribute('frameborder', '0'); newFrame.setAttribute('frameborder', '0');
newFrame.setAttribute('sandbox', options.allowScripts ? 'allow-scripts allow-forms allow-same-origin' : 'allow-same-origin'); newFrame.setAttribute('sandbox', options.allowScripts ? 'allow-scripts allow-forms allow-same-origin' : 'allow-same-origin');
if (FAKE_LOAD) { if (host.fakeLoad) {
// We should just be able to use srcdoc, but I wasn't // We should just be able to use srcdoc, but I wasn't
// seeing the service worker applying properly. // seeing the service worker applying properly.
// Fake load an empty on the correct origin and then write real html // Fake load an empty on the correct origin and then write real html
@ -378,7 +372,7 @@
newFrame.style.cssText = 'display: block; margin: 0; overflow: hidden; position: absolute; width: 100%; height: 100%; visibility: hidden'; newFrame.style.cssText = 'display: block; margin: 0; overflow: hidden; position: absolute; width: 100%; height: 100%; visibility: hidden';
document.body.appendChild(newFrame); document.body.appendChild(newFrame);
if (!FAKE_LOAD) { if (!host.fakeLoad) {
// write new content onto iframe // write new content onto iframe
newFrame.contentDocument.open(); newFrame.contentDocument.open();
} }
@ -386,7 +380,7 @@
newFrame.contentWindow.addEventListener('keydown', handleInnerKeydown); newFrame.contentWindow.addEventListener('keydown', handleInnerKeydown);
newFrame.contentWindow.addEventListener('DOMContentLoaded', e => { newFrame.contentWindow.addEventListener('DOMContentLoaded', e => {
if (FAKE_LOAD) { if (host.fakeLoad) {
newFrame.contentDocument.open(); newFrame.contentDocument.open();
newFrame.contentDocument.write(newDocument); newFrame.contentDocument.write(newDocument);
newFrame.contentDocument.close(); newFrame.contentDocument.close();
@ -451,14 +445,16 @@
// Bubble out link clicks // Bubble out link clicks
newFrame.contentWindow.addEventListener('click', handleInnerClick); newFrame.contentWindow.addEventListener('click', handleInnerClick);
host.onIframeLoaded(newFrame); if (host.onIframeLoaded) {
host.onIframeLoaded(newFrame);
}
} }
if (!FAKE_LOAD) { if (!host.fakeLoad) {
hookupOnLoadHandlers(newFrame); hookupOnLoadHandlers(newFrame);
} }
if (!FAKE_LOAD) { if (!host.fakeLoad) {
newFrame.contentDocument.write(newDocument); newFrame.contentDocument.write(newDocument);
newFrame.contentDocument.close(); newFrame.contentDocument.close();
} }