main modules use require() instead of arguments

This commit is contained in:
Feross Aboukhadijeh
2016-03-09 15:20:28 -08:00
parent 9dcc0522c7
commit 4fef6d00a8
3 changed files with 8 additions and 5 deletions

View File

@@ -3,8 +3,8 @@ var startTime = Date.now()
var electron = require('electron') var electron = require('electron')
var ipc = require('./ipc') var ipc = require('./ipc')
var menu = require('./menu') var menu = require('./menu')
var windows = require('./windows')
var shortcuts = require('./shortcuts') var shortcuts = require('./shortcuts')
var windows = require('./windows')
var app = electron.app var app = electron.app
@@ -13,8 +13,8 @@ app.startTime = startTime
app.on('ready', function () { app.on('ready', function () {
menu.init() menu.init()
windows.createMainWindow(menu) windows.createMainWindow()
shortcuts.init(menu, windows) shortcuts.init()
}) })
app.on('open-file', onOpen) app.on('open-file', onOpen)

View File

@@ -4,10 +4,12 @@ module.exports = {
var electron = require('electron') var electron = require('electron')
var localShortcut = require('electron-localshortcut') var localShortcut = require('electron-localshortcut')
var menu = require('./menu')
var windows = require('./windows')
var globalShortcut = electron.globalShortcut var globalShortcut = electron.globalShortcut
function init (menu, windows) { function init () {
// Special "media key" for play/pause, available on some keyboards // Special "media key" for play/pause, available on some keyboards
globalShortcut.register('MediaPlayPause', () => windows.main.send('dispatch', 'playPause')) globalShortcut.register('MediaPlayPause', () => windows.main.send('dispatch', 'playPause'))

View File

@@ -6,10 +6,11 @@ var windows = module.exports = {
var config = require('../config') var config = require('../config')
var debug = require('debug')('webtorrent-app:windows') var debug = require('debug')('webtorrent-app:windows')
var electron = require('electron') var electron = require('electron')
var menu = require('./menu')
var app = electron.app var app = electron.app
function createMainWindow (menu) { function createMainWindow () {
var win = windows.main = new electron.BrowserWindow({ var win = windows.main = new electron.BrowserWindow({
autoHideMenuBar: true, // Hide top menu bar unless Alt key is pressed (Windows, Linux) autoHideMenuBar: true, // Hide top menu bar unless Alt key is pressed (Windows, Linux)
backgroundColor: '#282828', backgroundColor: '#282828',