web - switch back to window.onbeforeunload as otherwise the page unload can no longer be prevented

Benjamin Pasero · Benjamin Pasero · commit 5f5fce58809f · 2019-08-23T10:22:17.000+02:00
diff --git a/src/vs/platform/lifecycle/browser/lifecycleService.ts b/src/vs/platform/lifecycle/browser/lifecycleService.ts
@@ -8,7 +8,6 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { AbstractLifecycleService } from 'vs/platform/lifecycle/common/lifecycleService';
 import { localize } from 'vs/nls';
 import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
-import { addDisposableListener, EventType } from 'vs/base/browser/dom';
 
 export class BrowserLifecycleService extends AbstractLifecycleService {
 
@@ -23,7 +22,9 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
 	}
 
 	private registerListeners(): void {
-		addDisposableListener(window, EventType.BEFORE_UNLOAD, () => this.onBeforeUnload());
+		// Note: we cannot change this to window.addEventListener('beforeUnload')
+		// because it seems that mechanism does not allow for preventing the unload
+		window.onbeforeunload = () => this.onBeforeUnload();
 	}
 
 	private onBeforeUnload(): string | null {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import { ILogService } from 'vs/platform/log/common/log';`
`8`	`8`	`import { AbstractLifecycleService } from 'vs/platform/lifecycle/common/lifecycleService';`
`9`	`9`	`import { localize } from 'vs/nls';`
`10`	`10`	`import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';`
`11`		`-import { addDisposableListener, EventType } from 'vs/base/browser/dom';`
`12`	`11`
`13`	`12`	`export class BrowserLifecycleService extends AbstractLifecycleService {`
`14`	`13`
`@@ -23,7 +22,9 @@ export class BrowserLifecycleService extends AbstractLifecycleService {`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`private registerListeners(): void {`
`26`		`- addDisposableListener(window, EventType.BEFORE_UNLOAD, () => this.onBeforeUnload());`
	`25`	`+ // Note: we cannot change this to window.addEventListener('beforeUnload')`
	`26`	`+ // because it seems that mechanism does not allow for preventing the unload`
	`27`	`+ window.onbeforeunload = () => this.onBeforeUnload();`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`private onBeforeUnload(): string \| null {`