revert request popout intercepts
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<app-loading-spinner #spinner></app-loading-spinner>
|
<app-loading-spinner #spinner></app-loading-spinner>
|
||||||
<app-status-bar #status (getHelp)="getHelpModal.openModal(); helpStatus = $event; setExterHelp()"></app-status-bar>
|
<app-status-bar #status (getHelp)="getHelpModal.openModal(); helpStatus = $event; setExterHelp()"></app-status-bar>
|
||||||
<webview id="mainWebView" #webview httpreferrer="https://sdiequestvr.com" [attr.src]="webUrl" allowpopups [ngStyle]="{'left':webService.isWebviewOpen?'0':'-100%'}" class="bsaber-webview" partition='webview-partition'></webview>
|
<webview id="mainWebView" #webview httpreferrer="https://sdiequestvr.com" [attr.src]="webUrl" allowpopups [ngStyle]="{'left':webService.isWebviewOpen?'0':'-100%'}" class="bsaber-webview"></webview>
|
||||||
|
|
||||||
<mz-modal #getHelpModal [fixedFooter]="true">
|
<mz-modal #getHelpModal [fixedFooter]="true">
|
||||||
<mz-modal-header>
|
<mz-modal-header>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Injectable, isDevMode } from '@angular/core';
|
import { Injectable, isDevMode } from '@angular/core';
|
||||||
import { AppService } from './app.service';
|
import { AppService } from './app.service';
|
||||||
import { environment } from '../environments/environment';
|
import { environment } from '../environments/environment';
|
||||||
import { OPEN_IN_SYSTEM_BROWSER_DOMAINS } from '../../../electron/external-urls';
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
@@ -46,17 +45,6 @@ export class WebviewService {
|
|||||||
.bsaber-tooltip.-sidequest-remove::after {
|
.bsaber-tooltip.-sidequest-remove::after {
|
||||||
content: "Remove Custom Level";
|
content: "Remove Custom Level";
|
||||||
}`;
|
}`;
|
||||||
let ses = this.appService.remote.session.fromPartition('webview-partition');
|
|
||||||
ses.webRequest.onBeforeRequest((details, callback) => {
|
|
||||||
let url = details.url;
|
|
||||||
const extUrl = new URL(url).host.toLowerCase();
|
|
||||||
if (OPEN_IN_SYSTEM_BROWSER_DOMAINS.includes(extUrl)) {
|
|
||||||
this.appService.electron.shell.openExternal(url);
|
|
||||||
callback({ cancel: true });
|
|
||||||
} else {
|
|
||||||
callback({});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.webView.addEventListener('did-start-loading', e => {
|
this.webView.addEventListener('did-start-loading', e => {
|
||||||
this.isWebviewLoading = true;
|
this.isWebviewLoading = true;
|
||||||
this.webView.insertCSS(customCss);
|
this.webView.insertCSS(customCss);
|
||||||
|
|||||||
Reference in New Issue
Block a user