From 417134c799809c6decc765381f5f30f526ae66a3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 4 Sep 2014 11:13:04 -0700 Subject: [PATCH] Require dialog when used --- src/browser/atom-application.coffee | 3 ++- src/browser/atom-window.coffee | 3 ++- src/browser/auto-update-manager.coffee | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index d47bba1d9..72807b08c 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -5,7 +5,6 @@ AutoUpdateManager = require './auto-update-manager' BrowserWindow = require 'browser-window' Menu = require 'menu' app = require 'app' -dialog = require 'dialog' fs = require 'fs' ipc = require 'ipc' path = require 'path' @@ -484,5 +483,7 @@ class AtomApplication when 'folder' then ['openDirectory'] when 'all' then ['openFile', 'openDirectory'] else throw new Error("#{type} is an invalid type for promptForPath") + + dialog = require 'dialog' dialog.showOpenDialog title: 'Open', properties: properties.concat(['multiSelections', 'createDirectory']), (pathsToOpen) => @openPaths({pathsToOpen, devMode, safeMode, window}) diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee index a2736077a..166b971d0 100644 --- a/src/browser/atom-window.coffee +++ b/src/browser/atom-window.coffee @@ -1,6 +1,5 @@ BrowserWindow = require 'browser-window' app = require 'app' -dialog = require 'dialog' path = require 'path' fs = require 'fs' url = require 'url' @@ -101,6 +100,7 @@ class AtomWindow @browserWindow.on 'unresponsive', => return if @isSpec + dialog = require 'dialog' chosen = dialog.showMessageBox @browserWindow, type: 'warning' buttons: ['Close', 'Keep Waiting'] @@ -111,6 +111,7 @@ class AtomWindow @browserWindow.webContents.on 'crashed', => global.atomApplication.exit(100) if @exitWhenDone + dialog = require 'dialog' chosen = dialog.showMessageBox @browserWindow, type: 'warning' buttons: ['Close Window', 'Reload', 'Keep It Open'] diff --git a/src/browser/auto-update-manager.coffee b/src/browser/auto-update-manager.coffee index 3ab2b37c2..35c6b562c 100644 --- a/src/browser/auto-update-manager.coffee +++ b/src/browser/auto-update-manager.coffee @@ -1,5 +1,4 @@ autoUpdater = require 'auto-updater' -dialog = require 'dialog' _ = require 'underscore-plus' {EventEmitter} = require 'events' @@ -91,10 +90,12 @@ class AutoUpdateManager onUpdateNotAvailable: => autoUpdater.removeListener 'error', @onUpdateError + dialog = require 'dialog' dialog.showMessageBox type: 'info', buttons: ['OK'], message: 'No update available.', detail: "Version #{@version} is the latest version." onUpdateError: (event, message) => autoUpdater.removeListener 'update-not-available', @onUpdateNotAvailable + dialog = require 'dialog' dialog.showMessageBox type: 'warning', buttons: ['OK'], message: 'There was an error checking for updates.', detail: message getWindows: ->