Merge pull request #873 from 0mkara/electron_fixes

Electron fixes

Merge pull request #873 from 0mkara/electron_fixes
a46e359f · yann300 · GitHub · d3c49f7f · 9c981991 · a46e359f
Unverified Commit a46e359f authored Aug 24, 2018 by yann300 Committed by GitHub Aug 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

compiler.js remix-solidity/src/compiler/compiler.js +2 -1

No files found.
--- a/remix-solidity/src/compiler/compiler.js
+++ b/remix-solidity/src/compiler/compiler.js
@@ -73,7 +73,8 @@ function Compiler (handleImportCall) {
  function onInternalCompilerLoaded () {
    if (worker === null) {
      var compiler
-      if (typeof (window) === 'undefined') {
+      var userAgent = navigator.userAgent.toLowerCase()
+      if (typeof (window) === 'undefined' || userAgent.indexOf(' electron/') > -1) {
        compiler = require('solc')
      } else {
        compiler = solc(window.Module)