Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved electron detection.

Browse source
This commit is contained in:
Martin Edenhofer 2016-03-30 20:44:28 +02:00
parent 41eb9901d7
commit 618d583587
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/lib/base/email-addresses.js
View file

@ -947,7 +947,7 @@ parse5322.parseAddressList = parseAddressListSimple;
// if electron is used, go back to non CommonJS // if electron is used, go back to non CommonJS
//if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') { //if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined' && !(process && process.version && process.versions.electron)) { if (typeof module !== 'undefined' && typeof module.exports !== 'undefined' && !(window.process && window.process.version && window.process.versions.electron)) {
module.exports = parse5322; module.exports = parse5322;
} else { } else {
global.emailAddresses = parse5322; global.emailAddresses = parse5322;

2
app/assets/javascripts/app/lib/core/jquery-2.2.1.js vendored
View file

@ -16,7 +16,7 @@
// if electron is used, go back to non CommonJS // if electron is used, go back to non CommonJS
//if ( typeof module === "object" && typeof module.exports === "object" ) { //if ( typeof module === "object" && typeof module.exports === "object" ) {
if ( typeof module === "object" && typeof module.exports === "object" && !(process && process.version && process.versions.electron)) { if ( typeof module === "object" && typeof module.exports === "object" && !(window.process && window.process.version && window.process.versions.electron)) {
// For CommonJS and CommonJS-like environments where a proper `window` // For CommonJS and CommonJS-like environments where a proper `window`
// is present, execute the factory and get jQuery. // is present, execute the factory and get jQuery.
// For environments that do not have a `window` with a `document` // For environments that do not have a `window` with a `document`