Skip to content

Commit 94eb764

Browse files
author
Matt Bierner
committed
Use dom-ready event instead of did-start-loading for webviews
This should be safer since we know the webview is fully ready
1 parent 48c6e39 commit 94eb764

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
130130
this._myLogService.debug(`Webview(${this.id}): init`);
131131

132132
const webviewId = new Promise<number | undefined>((resolve, reject) => {
133-
const sub = this._register(addDisposableListener(this.element!, 'did-start-loading', once(() => {
133+
const sub = this._register(addDisposableListener(this.element!, 'dom-ready', once(() => {
134134
if (!this.element) {
135135
reject();
136136
throw new Error('No element');
@@ -141,7 +141,7 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
141141
});
142142
this._resourceRequestManager = this._register(instantiationService.createInstance(WebviewResourceRequestManager, id, extension, this.content.options, webviewId));
143143

144-
this._register(addDisposableListener(this.element!, 'did-start-loading', once(() => {
144+
this._register(addDisposableListener(this.element!, 'dom-ready', once(() => {
145145
this._register(ElectronWebviewBasedWebview.getWebviewKeyboardHandler(configurationService, mainProcessService).add(this.element!));
146146
})));
147147

0 commit comments

Comments
 (0)