mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use window.log in browser context, turn on console eslint rule

Browse source
This commit is contained in:
Scott Nonnenberg 2018-07-21 12:00:08 -07:00
parent 4320b125dd
commit 5933a34a18
71 changed files with 816 additions and 559 deletions
Download patch file Download diff file Expand all files Collapse all files

13
preload.js
View file

@ -1,8 +1,6 @@
/* global Whisper: false */
/* global window: false */
console.log('preload');
const electron = require('electron');
const semver = require('semver');
@ -34,7 +32,7 @@ window.isBeforeVersion = (toCheck, baseVersion) => {
try {
return semver.lt(toCheck, baseVersion);
} catch (error) {
console.log(
window.log.error(
`isBeforeVersion error: toCheck: ${toCheck}, baseVersion: ${baseVersion}`,
error && error.stack ? error.stack : error
);
@ -55,11 +53,11 @@ window.open = () => null;
window.eval = global.eval = () => null;
window.drawAttention = () => {
console.log('draw attention');
window.log.info('draw attention');
ipc.send('draw-attention');
};
window.showWindow = () => {
console.log('show window');
window.log.info('show window');
ipc.send('show-window');
};
@ -70,7 +68,7 @@ window.setMenuBarVisibility = visibility =>
ipc.send('set-menu-bar-visibility', visibility);
window.restart = () => {
console.log('restart');
window.log.info('restart');
ipc.send('restart');
};
@ -188,7 +186,7 @@ window.removeSetupMenuItems = () => ipc.send('remove-setup-menu-items');
require('./js/logging');
if (config.proxyUrl) {
console.log('using proxy url', config.proxyUrl);
window.log.info('Using provided proxy url');
}
window.nodeSetImmediate = setImmediate;
@ -241,6 +239,7 @@ window.Signal = Signal.setup({
Attachments,
userDataPath: app.getPath('userData'),
getRegionCode: () => window.storage.get('regionCode'),
logger: window.log,
});
// Pulling these in separately since they access filesystem, electron