Commit f2b35da6241035ad755362eb901f03166182ee40
Merge branch 'master' of github.com:ssbc/patchbay
mixmix committed on 12/3/2018, 11:13:24 PMParent: 948ffbf7c6724ffa9fb57ecc8b39139b9202bc22
Parent: e02a57f5d64d777ec2b715175dba548f2a0c07f1
Files changed
assets/base.html | changed |
assets/base.html | ||
---|---|---|
@@ -3,25 +3,21 @@ | ||
3 | 3 … | <head></head> |
4 | 4 … | <body> |
5 | 5 … | <script> |
6 | 6 … | // redirect console to main process |
7 | - var electron = require('electron') | |
8 | - var localLog = console.log | |
9 | - var localError = console.error | |
10 | - var remoteLog = electron.remote.getGlobal('console').log | |
11 | - var remoteError = electron.remote.getGlobal('console').error | |
7 … | + const { log: remoteLog, error: remoteErr } = require('console') | |
8 … | + const { log: localLog, error: localErr } = console | |
12 | 9 … | |
13 | 10 … | console.log = function (...args) { |
14 | - localLog.apply(console, args) | |
11 … | + localLog(...args) | |
15 | 12 … | remoteLog(...args) |
16 | 13 … | } |
17 | 14 … | |
18 | 15 … | console.error = function (...args) { |
19 | - localError.apply(console, args) | |
20 | - remoteError(...args) | |
16 … | + localErr(...args) | |
17 … | + remoteErr(...args) | |
21 | 18 … | } |
22 | 19 … | |
23 | - process.exit = electron.remote.app.quit | |
24 | 20 … | // redirect errors to stderr |
25 | 21 … | window.addEventListener('error', function (e) { |
26 | 22 … | e.preventDefault() |
27 | 23 … | console.error(e.error.stack || 'Uncaught ' + e.error) |
Built with git-ssb-web