Skip to content
This repository has been archived by the owner on Dec 27, 2022. It is now read-only.

Commit

Permalink
switch to custom electron build; set webpreferences to enable display…
Browse files Browse the repository at this point in the history
…ing insecure content (close #94)
  • Loading branch information
pfrazee committed Oct 18, 2016
1 parent 0d65ea1 commit f1710d7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions app/shell-window/pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,7 @@ function createWebviewEl (id, url) {
var el = document.createElement('webview')
el.dataset.id = id
el.setAttribute('preload', 'file://'+path.join(remote.app.getAppPath(), 'webview-preload.build.js'))
el.setAttribute('webpreferences', 'allowDisplayingInsecureContent')
el.setAttribute('src', url || DEFAULT_URL)
return el
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"browserify": "^13.0.1",
"chai": "^3.5.0",
"electron-builder": "~5.30.0",
"electron": "1.4.1",
"electron": "beakerbrowser/electron-prebuilt",
"fs-jetpack": "^0.9.0",
"gulp": "^3.9.0",
"gulp-batch": "^1.0.5",
Expand Down Expand Up @@ -59,7 +59,7 @@
"scripts": {
"postinstall": "cd app && npm install",
"build": "gulp build",
"rebuild": "(cd app && npm rebuild --runtime=electron --target=1.4.1 --disturl=https://atom.io/download/atom-shell --build-from-source); gulp build",
"rebuild": "(cd app && npm rebuild --runtime=electron --target=1.4.3 --disturl=https://atom.io/download/atom-shell --build-from-source); gulp build",
"burnthemall": "rm -Rf ./node_modules ./app/node_modules; npm i",
"release": "build -m -p never",
"start": "gulp start",
Expand Down

0 comments on commit f1710d7

Please sign in to comment.