Skip to content

Commit

Permalink
Always enable electron contextIsolation
Browse files Browse the repository at this point in the history
  • Loading branch information
pvrobays committed Sep 13, 2021
1 parent a98fa65 commit 008d14d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 13 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Always enable electron contextIsolation

### Changed
- Checkbox type supports a single boolean value

## [2.4.1] - 2020-07-13
### Fixed
Expand Down
34 changes: 21 additions & 13 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,16 +223,7 @@ class ElectronPreferences extends EventEmitter2 {

}

show() {

if (this.prefsWindow) {

this.prefsWindow.focus();

return this.prefsWindow;

}

getBrowserWindowOptions() {
let browserWindowOpts = {
title: 'Preferences',
width: 800,
Expand All @@ -250,18 +241,20 @@ class ElectronPreferences extends EventEmitter2 {
const defaultWebPreferences = {
nodeIntegration: false,
enableRemoteModule: false,
contextIsolation: true,
preload: path.join(__dirname, './preload.js'),
};

const unOverridableWebPreferences = {
contextIsolation: true,
}

// User provider `browserWindow`, we load those
if (this.options.browserWindowOverrides) {

browserWindowOpts = Object.assign(browserWindowOpts, this.options.browserWindowOverrides);

}

//
if (browserWindowOpts.webPreferences) {

browserWindowOpts.webPreferences = Object.assign(defaultWebPreferences, browserWindowOpts.webPreferences);
Expand All @@ -272,7 +265,22 @@ class ElectronPreferences extends EventEmitter2 {

}

this.prefsWindow = new BrowserWindow(browserWindowOpts);
browserWindowOpts.webPreferences = Object.assign(browserWindowOpts.webPreferences, unOverridableWebPreferences);

return browserWindowOpts;
}

show() {

if (this.prefsWindow) {

this.prefsWindow.focus();

return this.prefsWindow;

}

this.prefsWindow = new BrowserWindow(this.getBrowserWindowOptions());

if (this.options.menuBar) {

Expand Down

0 comments on commit 008d14d

Please sign in to comment.