aboutsummaryrefslogtreecommitdiffstats
path: root/src/models
diff options
context:
space:
mode:
authorLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-05-26 21:05:50 +0530
committerLibravatar GitHub <noreply@github.com>2021-05-26 21:05:50 +0530
commit296ce5ce62bcde6888df291f97105fa912ed7d35 (patch)
treeb28e7d2373f1020c1183469aa3a9feafecede569 /src/models
parentAdded new entry in context menu: 'Download image' (#1449) (diff)
downloadferdium-app-296ce5ce62bcde6888df291f97105fa912ed7d35.tar.gz
ferdium-app-296ce5ce62bcde6888df291f97105fa912ed7d35.tar.zst
ferdium-app-296ce5ce62bcde6888df291f97105fa912ed7d35.zip
Replace 'remote' with 'electron/remote' (#1448)
* Locked new version of 'recipes' submodule with corresponding changes.
Diffstat (limited to 'src/models')
-rw-r--r--src/models/Service.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/models/Service.js b/src/models/Service.js
index a980ca4a3..b76e92a53 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -1,5 +1,6 @@
1import { autorun, computed, observable } from 'mobx'; 1import { autorun, computed, observable } from 'mobx';
2import { ipcRenderer, remote } from 'electron'; 2import { ipcRenderer } from 'electron';
3import { webContents } from '@electron/remote';
3import normalizeUrl from 'normalize-url'; 4import normalizeUrl from 'normalize-url';
4import path from 'path'; 5import path from 'path';
5 6
@@ -246,7 +247,7 @@ export default class Service {
246 247
247 248
248 initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) { 249 initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) {
249 const webContents = remote.webContents.fromId(this.webview.getWebContentsId()); 250 const webviewWebContents = webContents.fromId(this.webview.getWebContentsId());
250 251
251 // If the recipe has implemented modifyRequestHeaders, 252 // If the recipe has implemented modifyRequestHeaders,
252 // Send those headers to ipcMain so that it can be set in session 253 // Send those headers to ipcMain so that it can be set in session
@@ -337,14 +338,14 @@ export default class Service {
337 this.hasCrashed = true; 338 this.hasCrashed = true;
338 }); 339 });
339 340
340 webContents.on('login', (event, request, authInfo, callback) => { 341 webviewWebContents.on('login', (event, request, authInfo, callback) => {
341 // const authCallback = callback; 342 // const authCallback = callback;
342 debug('browser login event', authInfo); 343 debug('browser login event', authInfo);
343 event.preventDefault(); 344 event.preventDefault();
344 345
345 if (authInfo.isProxy && authInfo.scheme === 'basic') { 346 if (authInfo.isProxy && authInfo.scheme === 'basic') {
346 debug('Sending service echo ping'); 347 debug('Sending service echo ping');
347 webContents.send('get-service-id'); 348 webviewWebContents.send('get-service-id');
348 349
349 debug('Received service id', this.id); 350 debug('Received service id', this.id);
350 351