Move webview loaded event to fix extensions using previewHTML

microsoft · Mar 2, 2017 · 439b3e6 · 439b3e6
1 parent 49129d1
commit 439b3e6
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/vs/workbench/parts/html/browser/webview-pre.js b/src/vs/workbench/parts/html/browser/webview-pre.js
@@ -127,11 +127,6 @@ document.addEventListener("DOMContentLoaded", function (event) {
 
 		// write new content onto iframe
 		newFrame.contentDocument.open('text/html', 'replace');
-		// 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
-		newFrame.contentDocument.write('<!DOCTYPE html>');
-		newFrame.contentDocument.write(newDocument.documentElement.innerHTML);
-		newFrame.contentDocument.close();
 
 		// workaround for https://github.com/Microsoft/vscode/issues/12865
 		// check new scrollTop and reset if neccessary
@@ -143,6 +138,12 @@ document.addEventListener("DOMContentLoaded", function (event) {
 			newFrame.style.display = 'block';
 		});
 
+		// 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
+		newFrame.contentDocument.write('<!DOCTYPE html>');
+		newFrame.contentDocument.write(newDocument.documentElement.innerHTML);
+		newFrame.contentDocument.close();
+
 		ipcRenderer.sendToHost('did-set-content', stats);
 	});