jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-24 15:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Electron to v0.37.6 (#350)

Browse Source 
* Upgrade Electron to v0.37.6

The main motiviation for such upgrade is that an error manifesting
itself as `Cannot read property 'object' of undefined` on certain Linux
systems was fixed in v0.37.4.

See https://github.com/electron/electron/issues/5229
Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>

* Make use of shell module by requiring `shell`

Otherwise we get a strange issue when trying to stub it:

    TypeError: Attempted to wrap undefined property openExternal as function

Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
This commit is contained in:
Juan Cruz Viotti 2016-04-21 10:26:29 -04:00
parent 148b9d15ae
commit dcff257f20
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ ELECTRON_PACKAGER=./node_modules/.bin/electron-packager
ELECTRON_BUILDER=./node_modules/.bin/electron-builder
ELECTRON_OSX_SIGN=./node_modules/.bin/electron-osx-sign
ELECTRON_IGNORE=$(shell node scripts/packageignore.js)
ELECTRON_VERSION=0.36.11
ELECTRON_VERSION=0.37.6
ETCHER_VERSION=$(shell node -e "console.log(require('./package.json').version)")
APPLICATION_NAME=$(shell node -e "console.log(require('./package.json').displayName)")
APPLICATION_DESCRIPTION=$(shell node -e "console.log(require('./package.json').description)")

3
lib/browser/os/open-external/directives/open-external.js
View File

@ -16,8 +16,7 @@
'use strict';
const electron = require('electron');
const shell = electron.remote.require('shell');
const shell = require('shell');
const os = require('os');
const nodeOpen = require('open');

2
package.json
View File

@ -78,7 +78,7 @@
"electron-mocha": "^0.8.0",
"electron-osx-sign": "^0.3.0",
"electron-packager": "^6.0.0",
"electron-prebuilt": "^0.36.11",
"electron-prebuilt": "^0.37.6",
"gulp": "^3.9.0",
"gulp-jscs": "^3.0.2",
"gulp-jshint": "^2.0.0",

3
tests/browser/os/open-external.spec.js
View File

@ -19,8 +19,7 @@
const m = require('mochainon');
const os = require('os');
const angular = require('angular');
const electron = require('electron');
const shell = electron.remote.require('shell');
const shell = require('shell');
require('angular-mocks');
describe('Browser: OSOpenExternal', function() {