From a4fe8353b97cd019626f7585a02b5d1432dd8356 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 8 Feb 2017 13:39:05 -0800 Subject: [PATCH] Move 4b007e50d25e78b3290e544cff6ca2867456cf13 webview fix to 1.9 --- src/vs/workbench/parts/html/browser/webview-pre.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/html/browser/webview-pre.js b/src/vs/workbench/parts/html/browser/webview-pre.js index 2ff559bd3b0f6..19b0847c5326d 100644 --- a/src/vs/workbench/parts/html/browser/webview-pre.js +++ b/src/vs/workbench/parts/html/browser/webview-pre.js @@ -131,7 +131,7 @@ document.addEventListener("DOMContentLoaded", function (event) { // workaround for https://github.com/Microsoft/vscode/issues/12865 // check new scrollTop and reset if neccessary setTimeout(function () { - if (scrollTop !== newFrame.contentDocument.body.scrollTop) { + if (newFrame.contentDocument && newFrame.contentDocument.body && scrollTop !== newFrame.contentDocument.body.scrollTop) { newFrame.contentDocument.body.scrollTop = scrollTop; } document.body.removeChild(frame);