From 5dc88aa543af3c5faa6bb3042e25538c2a5d3f56 Mon Sep 17 00:00:00 2001 From: Steve Kinney Date: Sat, 14 May 2016 11:17:46 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20Add=20ES6;=20Clean=20up=20from?= =?UTF-8?q?=20CoffeeScript=20conversion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/browser/api/app.js | 57 ++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 35 deletions(-) diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js index aed0028ee73e..2b57233fe685 100644 --- a/lib/browser/api/app.js +++ b/lib/browser/api/app.js @@ -1,33 +1,34 @@ 'use strict' const {Menu} = require('electron') -const EventEmitter = require('events').EventEmitter +const {EventEmitter} = require('events') const bindings = process.atomBinding('app') const downloadItemBindings = process.atomBinding('download_item') -const app = bindings.app +const {app} = bindings Object.setPrototypeOf(app, EventEmitter.prototype) -app.setApplicationMenu = function (menu) { - return Menu.setApplicationMenu(menu) -} +let appPath = null -app.getApplicationMenu = function () { - return Menu.getApplicationMenu() -} - -app.commandLine = { - appendSwitch: bindings.appendSwitch, - appendArgument: bindings.appendArgument -} +Object.assign(app, { + getAppPath() { return appPath }, + setAppPath(path) { appPath = path }, + setApplicationMenu(menu) { + return Menu.setApplicationMenu(menu) + }, + getApplicationMenu() { + return Menu.getApplicationMenu() + }, + commandLine: { + appendSwitch: bindings.appendSwitch, + appendArgument: bindings.appendArgument + } +}) if (process.platform === 'darwin') { app.dock = { - bounce: function (type) { - if (type == null) { - type = 'informational' - } + bounce (type = 'informational') { return bindings.dockBounce(type) }, cancelBounce: bindings.dockCancelBounce, @@ -41,30 +42,16 @@ if (process.platform === 'darwin') { } } -var appPath = null - -app.setAppPath = function (path) { - appPath = path -} - -app.getAppPath = function () { - return appPath -} - // Routes the events to webContents. -var ref1 = ['login', 'certificate-error', 'select-client-certificate'] -var fn = function (name) { - return app.on(name, function (event, webContents, ...args) { +const events = ['login', 'certificate-error', 'select-client-certificate'] +for (let name of events) { + app.on(name, (event, webContents, ...args) => { return webContents.emit.apply(webContents, [name, event].concat(args)) }) } -var i, len -for (i = 0, len = ref1.length; i < len; i++) { - fn(ref1[i]) -} // Wrappers for native classes. -var wrapDownloadItem = function (downloadItem) { +const wrapDownloadItem = (downloadItem) => { // downloadItem is an EventEmitter. Object.setPrototypeOf(downloadItem, EventEmitter.prototype) }