Run ESLint on preload.js

This commit is contained in:
Daniel Gasienica 2018-04-03 15:03:57 -04:00
parent 12cdeee7ec
commit 6e6b93d917
2 changed files with 143 additions and 133 deletions

View file

@ -28,4 +28,5 @@ test/views/*.js
!js/views/message_view.js !js/views/message_view.js
!js/views/settings_view.js !js/views/settings_view.js
!main.js !main.js
!preload.js
!prepare_build.js !prepare_build.js

View file

@ -1,159 +1,168 @@
(function () { /* global Whisper: false */
'use strict'; /* global window: false */
console.log('preload'); console.log('preload');
const electron = require('electron');
const Attachment = require('./js/modules/types/attachment'); const electron = require('electron');
const Attachments = require('./app/attachments');
const Message = require('./js/modules/types/message');
const { deferredToPromise } = require('./js/modules/deferred_to_promise');
const { app } = electron.remote; const Attachment = require('./js/modules/types/attachment');
const Attachments = require('./app/attachments');
const Message = require('./js/modules/types/message');
const { deferredToPromise } = require('./js/modules/deferred_to_promise');
const { app } = electron.remote;
window.PROTO_ROOT = 'protos'; window.PROTO_ROOT = 'protos';
window.config = require('url').parse(window.location.toString(), true).query; window.config = require('url').parse(window.location.toString(), true).query;
window.wrapDeferred = deferredToPromise;
const ipc = electron.ipcRenderer; window.wrapDeferred = deferredToPromise;
window.config.localeMessages = ipc.sendSync('locale-data');
window.setBadgeCount = function(count) { const ipc = electron.ipcRenderer;
ipc.send('set-badge-count', count); window.config.localeMessages = ipc.sendSync('locale-data');
};
window.drawAttention = function() {
console.log('draw attention');
ipc.send('draw-attention');
};
window.showWindow = function() {
console.log('show window');
ipc.send('show-window');
};
window.setAutoHideMenuBar = function(autoHide) {
ipc.send('set-auto-hide-menu-bar', autoHide);
};
window.setMenuBarVisibility = function(visibility) {
ipc.send('set-menu-bar-visibility', visibility);
};
window.restart = function() {
console.log('restart');
ipc.send('restart');
};
window.closeAbout = function() {
ipc.send('close-about');
};
window.updateTrayIcon = function(unreadCount) {
ipc.send('update-tray-icon', unreadCount);
};
ipc.on('debug-log', function() { window.setBadgeCount = count =>
Whisper.events.trigger('showDebugLog'); ipc.send('set-badge-count', count);
});
ipc.on('set-up-with-import', function() { window.drawAttention = () => {
Whisper.events.trigger('setupWithImport'); console.log('draw attention');
}); ipc.send('draw-attention');
};
window.showWindow = () => {
console.log('show window');
ipc.send('show-window');
};
ipc.on('set-up-as-new-device', function() { window.setAutoHideMenuBar = autoHide =>
Whisper.events.trigger('setupAsNewDevice'); ipc.send('set-auto-hide-menu-bar', autoHide);
});
ipc.on('set-up-as-standalone', function() { window.setMenuBarVisibility = visibility =>
Whisper.events.trigger('setupAsStandalone'); ipc.send('set-menu-bar-visibility', visibility);
});
ipc.on('show-settings', function() { window.restart = () => {
Whisper.events.trigger('showSettings'); console.log('restart');
}); ipc.send('restart');
};
window.addSetupMenuItems = function() { window.closeAbout = () =>
ipc.send('add-setup-menu-items'); ipc.send('close-about');
}
window.removeSetupMenuItems = function() { window.updateTrayIcon = unreadCount =>
ipc.send('remove-setup-menu-items'); ipc.send('update-tray-icon', unreadCount);
}
// We pull these dependencies in now, from here, because they have Node.js dependencies ipc.on('debug-log', () => {
Whisper.events.trigger('showDebugLog');
});
require('./js/logging'); ipc.on('set-up-with-import', () => {
Whisper.events.trigger('setupWithImport');
});
if (window.config.proxyUrl) { ipc.on('set-up-as-new-device', () => {
console.log('using proxy url', window.config.proxyUrl); Whisper.events.trigger('setupAsNewDevice');
} });
window.nodeSetImmediate = setImmediate; ipc.on('set-up-as-standalone', () => {
window.nodeWebSocket = require("websocket").w3cwebsocket; Whisper.events.trigger('setupAsStandalone');
});
// Linux seems to periodically let the event loop stop, so this is a global workaround ipc.on('show-settings', () => {
setInterval(function() { Whisper.events.trigger('showSettings');
window.nodeSetImmediate(function() {}); });
}, 1000);
window.dataURLToBlobSync = require('blueimp-canvas-to-blob'); window.addSetupMenuItems = () =>
window.loadImage = require('blueimp-load-image'); ipc.send('add-setup-menu-items');
window.ProxyAgent = require('proxy-agent');
window.EmojiConvertor = require('emoji-js');
window.emojiData = require('emoji-datasource');
window.nodeFetch = require('node-fetch');
window.nodeBuffer = Buffer;
window.EmojiPanel = require('emoji-panel');
window.libphonenumber = require('google-libphonenumber').PhoneNumberUtil.getInstance();
window.libphonenumber.PhoneNumberFormat = require('google-libphonenumber').PhoneNumberFormat;
window.nodeNotifier = require('node-notifier');
const { autoOrientImage } = require('./js/modules/auto_orient_image'); window.removeSetupMenuItems = () =>
window.autoOrientImage = autoOrientImage; ipc.send('remove-setup-menu-items');
// ES2015+ modules // We pull these dependencies in now, from here, because they have Node.js dependencies
const attachmentsPath = Attachments.getPath(app.getPath('userData'));
const deleteAttachmentData = Attachments.deleteData(attachmentsPath);
const readAttachmentData = Attachments.readData(attachmentsPath);
const writeAttachmentData = Attachments.writeData(attachmentsPath);
// Injected context functions to keep `Message` agnostic from Electron: require('./js/logging');
const upgradeSchemaContext = {
writeAttachmentData,
};
const upgradeMessageSchema = message =>
Message.upgradeSchema(message, upgradeSchemaContext);
const { getPlaceholderMigrations } = if (window.config.proxyUrl) {
require('./js/modules/migrations/get_placeholder_migrations'); console.log('using proxy url', window.config.proxyUrl);
const { IdleDetector} = require('./js/modules/idle_detector'); }
window.Signal = {}; window.nodeSetImmediate = setImmediate;
window.Signal.Backup = require('./js/modules/backup'); window.nodeWebSocket = require('websocket').w3cwebsocket;
window.Signal.Crypto = require('./js/modules/crypto');
window.Signal.Database = require('./js/modules/database');
window.Signal.Debug = require('./js/modules/debug');
window.Signal.Logs = require('./js/modules/logs');
window.Signal.Migrations = {};
window.Signal.Migrations.deleteAttachmentData = Attachment.deleteData(deleteAttachmentData);
window.Signal.Migrations.getPlaceholderMigrations =getPlaceholderMigrations;
window.Signal.Migrations.loadAttachmentData = Attachment.loadData(readAttachmentData);
window.Signal.Migrations.Migrations0DatabaseWithAttachmentData =
require('./js/modules/migrations/migrations_0_database_with_attachment_data');
window.Signal.Migrations.Migrations1DatabaseWithoutAttachmentData =
require('./js/modules/migrations/migrations_1_database_without_attachment_data');
window.Signal.Migrations.upgradeMessageSchema = upgradeMessageSchema;
window.Signal.OS = require('./js/modules/os');
window.Signal.Settings = require('./js/modules/settings');
window.Signal.Types = {};
window.Signal.Types.Attachment = Attachment;
window.Signal.Types.Errors = require('./js/modules/types/errors');
window.Signal.Types.Message = Message;
window.Signal.Types.MIME = require('./js/modules/types/mime');
window.Signal.Types.Settings = require('./js/modules/types/settings');
window.Signal.Views = {};
window.Signal.Views.Initialization = require('./js/modules/views/initialization');
window.Signal.Workflow = {};
window.Signal.Workflow.IdleDetector = IdleDetector;
window.Signal.Workflow.MessageDataMigrator =
require('./js/modules/messages_data_migrator');
// We pull this in last, because the native module involved appears to be sensitive to // Linux seems to periodically let the event loop stop, so this is a global workaround
// /tmp mounted as noexec on Linux. setInterval(() => {
require('./js/spell_check'); window.nodeSetImmediate(() => {});
})(); }, 1000);
const { autoOrientImage } = require('./js/modules/auto_orient_image');
window.autoOrientImage = autoOrientImage;
window.dataURLToBlobSync = require('blueimp-canvas-to-blob');
window.EmojiConvertor = require('emoji-js');
window.emojiData = require('emoji-datasource');
window.EmojiPanel = require('emoji-panel');
window.libphonenumber = require('google-libphonenumber').PhoneNumberUtil.getInstance();
window.libphonenumber.PhoneNumberFormat =
require('google-libphonenumber').PhoneNumberFormat;
window.loadImage = require('blueimp-load-image');
window.nodeBuffer = Buffer;
window.nodeFetch = require('node-fetch');
window.nodeNotifier = require('node-notifier');
window.ProxyAgent = require('proxy-agent');
// ES2015+ modules
const attachmentsPath = Attachments.getPath(app.getPath('userData'));
const deleteAttachmentData = Attachments.deleteData(attachmentsPath);
const readAttachmentData = Attachments.readData(attachmentsPath);
const writeAttachmentData = Attachments.writeData(attachmentsPath);
// Injected context functions to keep `Message` agnostic from Electron:
const upgradeSchemaContext = {
writeAttachmentData,
};
const upgradeMessageSchema = message =>
Message.upgradeSchema(message, upgradeSchemaContext);
const { getPlaceholderMigrations } =
require('./js/modules/migrations/get_placeholder_migrations');
const { IdleDetector } = require('./js/modules/idle_detector');
window.Signal = {};
window.Signal.Backup = require('./js/modules/backup');
window.Signal.Crypto = require('./js/modules/crypto');
window.Signal.Database = require('./js/modules/database');
window.Signal.Debug = require('./js/modules/debug');
window.Signal.Logs = require('./js/modules/logs');
window.Signal.Migrations = {};
window.Signal.Migrations.deleteAttachmentData =
Attachment.deleteData(deleteAttachmentData);
window.Signal.Migrations.getPlaceholderMigrations = getPlaceholderMigrations;
window.Signal.Migrations.loadAttachmentData = Attachment.loadData(readAttachmentData);
window.Signal.Migrations.Migrations0DatabaseWithAttachmentData =
require('./js/modules/migrations/migrations_0_database_with_attachment_data');
window.Signal.Migrations.Migrations1DatabaseWithoutAttachmentData =
require('./js/modules/migrations/migrations_1_database_without_attachment_data');
window.Signal.Migrations.upgradeMessageSchema = upgradeMessageSchema;
window.Signal.OS = require('./js/modules/os');
window.Signal.Settings = require('./js/modules/settings');
window.Signal.Types = {};
window.Signal.Types.Attachment = Attachment;
window.Signal.Types.Errors = require('./js/modules/types/errors');
window.Signal.Types.Message = Message;
window.Signal.Types.MIME = require('./js/modules/types/mime');
window.Signal.Types.Settings = require('./js/modules/types/settings');
window.Signal.Views = {};
window.Signal.Views.Initialization = require('./js/modules/views/initialization');
window.Signal.Workflow = {};
window.Signal.Workflow.IdleDetector = IdleDetector;
window.Signal.Workflow.MessageDataMigrator =
require('./js/modules/messages_data_migrator');
// We pull this in last, because the native module involved appears to be sensitive to
// /tmp mounted as noexec on Linux.
require('./js/spell_check');