Fixing click intercept and other event hookup for iframe based webviews

85e96fb4 · Matt Bierner · 36ca1f4a · 85e96fb4
隐藏空白更改
内联并排

Showing with 31 addition and 24 deletion

src/vs/workbench/contrib/webview/browser/pre/main.js src/vs/workbench/contrib/webview/browser/pre/main.js +31 -24

未找到文件。
--- a/src/vs/workbench/contrib/webview/browser/pre/main.js
+++ b/src/vs/workbench/contrib/webview/browser/pre/main.js
@@ -381,6 +381,7 @@
 						newFrame.contentDocument.write('<!DOCTYPE html>');
 						newFrame.contentDocument.write(newDocument.documentElement.innerHTML);
 						newFrame.contentDocument.close();
+						hookupOnLoadHandlers(newFrame);
 					}
 					const contentDocument = e.target ? (/** @type {HTMLDocument} */ (e.target)) : undefined;
 					if (contentDocument) {
@@ -388,17 +389,6 @@
 					}
 				});

-				newFrame.contentWindow.onbeforeunload = () => {
-					if (isInDevelopmentMode) { // Allow reloads while developing a webview
-						host.postMessage('do-reload');
-						return false;
-					}
-
-					// Block navigation when not in development mode
-					console.log('prevented webview navigation');
-					return false;
-				};
-
 				const onLoad = (contentDocument, contentWindow) => {
 					if (contentDocument && contentDocument.body) {
 						// Workaround for https://github.com/Microsoft/vscode/issues/12865
@@ -429,24 +419,41 @@
 					}
 				};

-				clearTimeout(loadTimeout);
-				loadTimeout = undefined;
-				loadTimeout = setTimeout(() => {
+				function hookupOnLoadHandlers(newFrame) {
 					clearTimeout(loadTimeout);
 					loadTimeout = undefined;
-					onLoad(newFrame.contentDocument, newFrame.contentWindow);
-				}, 200);
-
-				newFrame.contentWindow.addEventListener('load', function (e) {
-					if (loadTimeout) {
+					loadTimeout = setTimeout(() => {
 						clearTimeout(loadTimeout);
 						loadTimeout = undefined;
-						onLoad(e.target, this);
-					}
-				});
+						onLoad(newFrame.contentDocument, newFrame.contentWindow);
+					}, 200);
+
+					newFrame.contentWindow.addEventListener('load', function (e) {
+						if (loadTimeout) {
+							clearTimeout(loadTimeout);
+							loadTimeout = undefined;
+							onLoad(e.target, this);
+						}
+					});

-				// Bubble out link clicks
-				newFrame.contentWindow.addEventListener('click', handleInnerClick);
+					newFrame.contentWindow.onbeforeunload = () => {
+						if (isInDevelopmentMode) { // Allow reloads while developing a webview
+							host.postMessage('do-reload');
+							return false;
+						}
+
+						// Block navigation when not in development mode
+						console.log('prevented webview navigation');
+						return false;
+					};
+
+					// Bubble out link clicks
+					newFrame.contentWindow.addEventListener('click', handleInnerClick);
+				}
+
+				if (!FAKE_LOAD) {
+					hookupOnLoadHandlers(newFrame);
+				}

 				// set DOCTYPE for newDocument explicitly as DOMParser.parseFromString strips it off
 				// and DOCTYPE is needed in the iframe to ensure that the user agent stylesheet is correctly overridden