Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

fixed webview tagd and updated electrong to 1.2.5 #905

Merged
merged 1 commit into from
Jun 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ Once a Mist version is released the Meteor frontend part is bundled using `meteo

Requirements:

* Electron v1.2.2
* Electron v1.2.5
* Node v4.3.0 or above

To run mist in development you need [Node.js NPM](https://nodejs.org) and [Meteor](https://www.meteor.com/install) and electron installed:

$ curl https://install.meteor.com/ | sh
$ npm install -g electron-prebuilt@1.2.2
$ npm install -g electron-prebuilt@1.2.5
$ npm install -g gulp

### Installation
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var type = 'mist';
var filenameLowercase = 'mist';
var filenameUppercase = 'Mist';
var applicationName = 'Mist';
var electronVersion = '1.2.2';
var electronVersion = '1.2.5';
var gethVersion = '1.4.7';
var nodeUrls = {
'darwin-x64': 'https://github.com/ethereum/go-ethereum/releases/download/v1.4.7/geth-OSX-2016061509421-1.4.7-667a386.zip',
Expand Down
1 change: 1 addition & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ app.on('ready', function() {
width: 1024 + 208,
height: 720,
webPreferences: {
nodeIntegration: true,
preload: __dirname +'/modules/preloader/mistUI.js',
'overlay-fullscreen-video': true,
'overlay-scrollbars': true
Expand Down
6 changes: 6 additions & 0 deletions modules/preloader/mistUI.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ window.syncMinimongo = syncMinimongo;
window.ipc = ipc;


// remove require and modules, when node-integration is on
delete window.module;
delete window.require;



// prevent overwriting the Dapps Web3
delete global.Web3;
delete window.Web3;
Expand Down