diff --git a/spec-nylas/inbox-sync-worker-spec.coffee b/spec-nylas/nylas-sync-worker-spec.coffee similarity index 100% rename from spec-nylas/inbox-sync-worker-spec.coffee rename to spec-nylas/nylas-sync-worker-spec.coffee diff --git a/src/browser/window-manager.coffee b/src/browser/window-manager.coffee index ef76ae9af..140fec64b 100644 --- a/src/browser/window-manager.coffee +++ b/src/browser/window-manager.coffee @@ -2,6 +2,7 @@ _ = require 'underscore-plus' fs = require 'fs-plus' AtomWindow = require './atom-window' BrowserWindow = require 'browser-window' +app = require 'app' class WindowManager @@ -312,10 +313,9 @@ class WindowManager visible = false visible ||= window.isVisible() for window in @_windows if visible is false - @quitting = true + global.application.quitting = true # Quitting the app from within a window event handler causes # an assertion error. Wait a moment. _.defer -> app.quit() - module.exports = WindowManager diff --git a/src/flux/edgehill-api.coffee b/src/flux/edgehill-api.coffee index 6bf55adf4..5f4482c4e 100644 --- a/src/flux/edgehill-api.coffee +++ b/src/flux/edgehill-api.coffee @@ -59,7 +59,7 @@ class EdgehillAPI # todo: remove once the edgehill-server inbox service is called `nylas` if token.provider is 'inbox' - atom.config.set("nylas.token", token.access_token) + atom.config.set("nylas.token", token.access_token) if token.user_identifier? @_setCredentials({username: token.user_identifier, password: ''})