diff --git a/crash-reporter.js b/crash-reporter.js index 8bf9709..c1b1f70 100644 --- a/crash-reporter.js +++ b/crash-reporter.js @@ -1,3 +1,5 @@ +'use strict'; + var electron = require('electron'); // This file should be included from the main thread and every renderer thread. diff --git a/drag-drop-main.js b/drag-drop-main.js index 2dc802d..79ec36f 100644 --- a/drag-drop-main.js +++ b/drag-drop-main.js @@ -1,9 +1,48 @@ +'use strict'; + var electron = require('electron'); var app = electron.app; var ipc = electron.ipcMain; -var argv = sliceArgv(process.argv); var win; + +function sliceArgv(argv) { + var count = 1; + // We need to determine if we were run using electron or as a system installed app. + if (argv[0].search('electron') >= 0) { + count += 1; + } + return argv.slice(count); +} +var argv = sliceArgv(process.argv); + +function processArgv(argv) { + var files = []; + argv.forEach(function(arg) { + if (arg.substr(0, 2) === '--') { + console.log('received argument', arg); + } else { + files.push(arg); + } + }); + + if (files.length > 0) { + win.webContents.send('files', files); + } +} + +function onOpen(e, filename) { + e.preventDefault(); + + if (app.ipcReady) { + processArgv([ filename ]); + } else { + argv.push(filename); + } +} +app.on('open-file', onOpen); +app.on('open-url', onOpen); + function init(window) { if (win) { console.error("can't initiliaze drag-and-drop multiple times"); @@ -17,39 +56,4 @@ function init(window) { }); } -app.on('open-file', onOpen); -app.on('open-url', onOpen); -function onOpen(e, filename) { - e.preventDefault(); - - if (app.ipcReady) { - processArgv([ filename ]); - } else { - argv.push(filename); - } -} -function sliceArgv(argv) { - var count = 1; - // We need to determine if we were run using electron or as a system installed app. - if (argv[0].search('electron') >= 0) { - count += 1; - } - return argv.slice(count); -} - -function processArgv(argv) { - var files = []; - argv.forEach(function(arg) { - if (arg.substr(0 ,2) == '--') { - console.log('received argument', arg); - } else { - files.push(arg); - } - }); - - if (files.length > 0) { - win.webContents.send('files', files); - } -} - module.exports.init = init; diff --git a/drag-drop-render.js b/drag-drop-render.js index 257daca..c4f31ed 100644 --- a/drag-drop-render.js +++ b/drag-drop-render.js @@ -1,3 +1,5 @@ +'use strict'; + var electron = require('electron'); var ipc = electron.ipcRenderer; diff --git a/index.js b/index.js index 542d95e..eb097aa 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,5 @@ +'use strict'; + var electron = require('electron'); var app = electron.app; var BrowserWindow = electron.BrowserWindow; diff --git a/menu.js b/menu.js index 7e69df7..0eebf1b 100644 --- a/menu.js +++ b/menu.js @@ -1,5 +1,6 @@ +'use strict'; + var electron = require('electron'); -var app = electron.app; var win, menu; @@ -14,25 +15,6 @@ function getMenuItem (label) { return menuItem || {}; } -function updateFullScreenCheckbox() { - getMenuItem('Full Screen').checked = win.isFullScreen(); - win.setMenuBarVisibility(!win.isFullScreen()); -} -function toggleFullScreen(flag) { - if (!win || !win.isVisible()) { - return; - } - if (typeof flag !== 'boolean') { - flag = !win.isFullScreen(); - } - - if (flag) { - // Fullscreen and aspect ratio do not play well together. (Mac) - win.setAspectRatio(0); - } - win.setFullScreen(flag); -} - // Sets whether the window should always show on top of other windows function toggleAlwaysOnTop(flag) { if (!win) { @@ -209,10 +191,6 @@ function init(window) { menu = electron.Menu.buildFromTemplate(template); electron.Menu.setApplicationMenu(menu); - - win.webContents.on('dom-ready', updateFullScreenCheckbox); - win.on('enter-full-screen', updateFullScreenCheckbox); - win.on('leave-full-screen', updateFullScreenCheckbox); } module.exports.init = init; diff --git a/notifications.js b/notifications.js index 7b1b068..03da031 100644 --- a/notifications.js +++ b/notifications.js @@ -1,3 +1,5 @@ +'use strict'; + var electron = require('electron'); var ipc = electron.ipcRenderer; // This file runs in a render thread of the Electron app. It must be required (directly or diff --git a/progress.js b/progress.js index 8225fd0..9d2e456 100644 --- a/progress.js +++ b/progress.js @@ -1,23 +1,11 @@ +'use strict'; + var electron = require('electron'); var app = electron.app; var ipc = electron.ipcMain; var win; -function init(window) { - if (win) { - console.error("can't initialize badge/progress tracker multiple times"); - return; - } - win = window; - - ipc.on('notification', function (ev, count, target) { - updateProgress(count, target); - increaseBadge(); - }); - win.on('focus', clearBadge); -} - function increaseBadge() { if (!win.isFocused()) { app.setBadgeCount(app.getBadgeCount() + 1); @@ -35,4 +23,18 @@ function updateProgress(count, target) { } } +function init(window) { + if (win) { + console.error("can't initialize badge/progress tracker multiple times"); + return; + } + win = window; + + ipc.on('notification', function (ev, count, target) { + updateProgress(count, target); + increaseBadge(); + }); + win.on('focus', clearBadge); +} + module.exports.init = init; diff --git a/startup-main.js b/startup-main.js index 560be59..c23ff1b 100644 --- a/startup-main.js +++ b/startup-main.js @@ -1,3 +1,5 @@ +'use strict'; + var AutoLaunch = require('auto-launch'); var electron = require('electron'); var app = electron.app; @@ -18,6 +20,26 @@ var appLauncher = new AutoLaunch({ isHidden: true }); +function install () { + return appLauncher + .isEnabled() + .then(function (enabled) { + if (!enabled) { + return appLauncher.enable(); + } + }); +} + +function uninstall () { + return appLauncher + .isEnabled() + .then(function (enabled) { + if (enabled) { + return appLauncher.disable(); + } + }); +} + var win; function init(window) { if (win) { @@ -42,26 +64,6 @@ function init(window) { }); } -function install () { - return appLauncher - .isEnabled() - .then(function (enabled) { - if (!enabled) { - return appLauncher.enable(); - } - }); -} - -function uninstall () { - return appLauncher - .isEnabled() - .then(function (enabled) { - if (enabled) { - return appLauncher.disable(); - } - }); -} - module.exports = { init: init, }; diff --git a/startup-render.js b/startup-render.js index 1ec7dcc..1651820 100644 --- a/startup-render.js +++ b/startup-render.js @@ -1,3 +1,5 @@ +'use strict'; + var electron = require('electron'); var ipc = electron.ipcRenderer; diff --git a/tray.js b/tray.js index 4aca98c..e3c2f10 100644 --- a/tray.js +++ b/tray.js @@ -1,3 +1,5 @@ +'use strict'; + var path = require('path'); var electron = require('electron'); var app = electron.app;