diff --git a/package.json b/package.json
index 3977cb806..89d182ff1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"url": "https://github.com/atom/atom/issues"
},
"license": "MIT",
- "electronVersion": "0.34.5",
+ "electronVersion": "0.36.7",
"dependencies": {
"async": "0.2.6",
"atom-keymap": "^6.2.0",
diff --git a/spec/atom-reporter.coffee b/spec/atom-reporter.coffee
index 150eb9a4a..dcda4633b 100644
--- a/spec/atom-reporter.coffee
+++ b/spec/atom-reporter.coffee
@@ -172,7 +172,7 @@ class AtomReporter
listen document, 'click', '.stack-trace', (event) ->
event.currentTarget.classList.toggle('expanded')
- @reloadButton.addEventListener('click', -> require('ipc').send('call-window-method', 'restart'))
+ @reloadButton.addEventListener('click', -> require('electron').ipcRenderer.send('call-window-method', 'restart'))
updateSpecCounts: ->
if @skippedCount
diff --git a/spec/integration/helpers/start-atom.coffee b/spec/integration/helpers/start-atom.coffee
index af9ce094b..2939dd6ab 100644
--- a/spec/integration/helpers/start-atom.coffee
+++ b/spec/integration/helpers/start-atom.coffee
@@ -126,7 +126,7 @@ buildAtomClient = (args, env) ->
.addCommand "simulateQuit", (done) ->
@execute -> atom.unloadEditorWindow()
- .execute -> require("remote").require("app").emit("before-quit")
+ .execute -> require("electron").remote.app.emit("before-quit")
.call(done)
module.exports = (args, env, fn) ->
diff --git a/spec/jasmine-test-runner.coffee b/spec/jasmine-test-runner.coffee
index 62b42d0a9..5b5d4e225 100644
--- a/spec/jasmine-test-runner.coffee
+++ b/spec/jasmine-test-runner.coffee
@@ -1,7 +1,7 @@
_ = require 'underscore-plus'
fs = require 'fs-plus'
path = require 'path'
-ipc = require 'ipc'
+{ipcRenderer} = require 'electron'
module.exports = ({logFile, headless, testPaths, buildAtomEnvironment}) ->
window[key] = value for key, value of require '../vendor/jasmine'
@@ -88,7 +88,7 @@ buildTerminalReporter = (logFile, resolveWithExitCode) ->
if logStream?
fs.writeSync(logStream, str)
else
- ipc.send 'write-to-stderr', str
+ ipcRenderer.send 'write-to-stderr', str
{TerminalReporter} = require 'jasmine-tagged'
new TerminalReporter
diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js
index 9663c6222..08da07dd8 100644
--- a/spec/text-editor-component-spec.js
+++ b/spec/text-editor-component-spec.js
@@ -2151,10 +2151,11 @@ describe('TextEditorComponent', function () {
item.style.height = itemHeight + 'px'
wrapperNode.style.width = windowWidth + 'px'
wrapperNode.style.height = windowHeight + 'px'
- atom.setWindowDimensions({
+ await atom.setWindowDimensions({
width: windowWidth,
height: windowHeight
})
+
component.measureDimensions()
component.measureWindowSize()
await nextViewUpdatePromise()
@@ -4834,7 +4835,7 @@ describe('TextEditorComponent', function () {
it('pastes the previously selected text at the clicked location', async function () {
let clipboardWrittenTo = false
- spyOn(require('ipc'), 'send').andCallFake(function (eventName, selectedText) {
+ spyOn(require('electron').ipcRenderer, 'send').andCallFake(function (eventName, selectedText) {
if (eventName === 'write-text-to-selection-clipboard') {
require('../src/safe-clipboard').writeText(selectedText, 'selection')
clipboardWrittenTo = true
diff --git a/spec/window-event-handler-spec.coffee b/spec/window-event-handler-spec.coffee
index a988ae7de..bb7e1665b 100644
--- a/spec/window-event-handler-spec.coffee
+++ b/spec/window-event-handler-spec.coffee
@@ -4,7 +4,7 @@ fs = require 'fs-plus'
temp = require 'temp'
TextEditor = require '../src/text-editor'
WindowEventHandler = require '../src/window-event-handler'
-ipc = require 'ipc'
+{ipcRenderer} = require 'electron'
describe "WindowEventHandler", ->
[projectPath, windowEventHandler] = []
@@ -53,7 +53,7 @@ describe "WindowEventHandler", ->
describe "beforeunload event", ->
beforeEach ->
jasmine.unspy(TextEditor.prototype, "shouldPromptToSave")
- spyOn(ipc, 'send')
+ spyOn(ipcRenderer, 'send')
describe "when pane items are modified", ->
editor = null
@@ -65,13 +65,13 @@ describe "WindowEventHandler", ->
spyOn(atom.workspace, 'confirmClose').andReturn(true)
window.dispatchEvent(new CustomEvent('beforeunload'))
expect(atom.workspace.confirmClose).toHaveBeenCalled()
- expect(ipc.send).not.toHaveBeenCalledWith('did-cancel-window-unload')
+ expect(ipcRenderer.send).not.toHaveBeenCalledWith('did-cancel-window-unload')
it "cancels the unload if the user selects cancel", ->
spyOn(atom.workspace, 'confirmClose').andReturn(false)
window.dispatchEvent(new CustomEvent('beforeunload'))
expect(atom.workspace.confirmClose).toHaveBeenCalled()
- expect(ipc.send).toHaveBeenCalledWith('did-cancel-window-unload')
+ expect(ipcRenderer.send).toHaveBeenCalledWith('did-cancel-window-unload')
describe "when a link is clicked", ->
it "opens the http/https links in an external application", ->
diff --git a/spec/workspace-element-spec.coffee b/spec/workspace-element-spec.coffee
index 883bad2fc..cf773b4ef 100644
--- a/spec/workspace-element-spec.coffee
+++ b/spec/workspace-element-spec.coffee
@@ -1,4 +1,4 @@
-ipc = require 'ipc'
+{ipcRenderer} = require 'electron'
path = require 'path'
temp = require('temp').track()
@@ -127,35 +127,35 @@ describe "WorkspaceElement", ->
describe "the 'window:run-package-specs' command", ->
it "runs the package specs for the active item's project path, or the first project path", ->
workspaceElement = atom.views.getView(atom.workspace)
- spyOn(ipc, 'send')
+ spyOn(ipcRenderer, 'send')
# No project paths. Don't try to run specs.
atom.commands.dispatch(workspaceElement, "window:run-package-specs")
- expect(ipc.send).not.toHaveBeenCalledWith("run-package-specs")
+ expect(ipcRenderer.send).not.toHaveBeenCalledWith("run-package-specs")
projectPaths = [temp.mkdirSync("dir1-"), temp.mkdirSync("dir2-")]
atom.project.setPaths(projectPaths)
# No active item. Use first project directory.
atom.commands.dispatch(workspaceElement, "window:run-package-specs")
- expect(ipc.send).toHaveBeenCalledWith("run-package-specs", path.join(projectPaths[0], "spec"))
- ipc.send.reset()
+ expect(ipcRenderer.send).toHaveBeenCalledWith("run-package-specs", path.join(projectPaths[0], "spec"))
+ ipcRenderer.send.reset()
# Active item doesn't implement ::getPath(). Use first project directory.
item = document.createElement("div")
atom.workspace.getActivePane().activateItem(item)
atom.commands.dispatch(workspaceElement, "window:run-package-specs")
- expect(ipc.send).toHaveBeenCalledWith("run-package-specs", path.join(projectPaths[0], "spec"))
- ipc.send.reset()
+ expect(ipcRenderer.send).toHaveBeenCalledWith("run-package-specs", path.join(projectPaths[0], "spec"))
+ ipcRenderer.send.reset()
# Active item has no path. Use first project directory.
item.getPath = -> null
atom.commands.dispatch(workspaceElement, "window:run-package-specs")
- expect(ipc.send).toHaveBeenCalledWith("run-package-specs", path.join(projectPaths[0], "spec"))
- ipc.send.reset()
+ expect(ipcRenderer.send).toHaveBeenCalledWith("run-package-specs", path.join(projectPaths[0], "spec"))
+ ipcRenderer.send.reset()
# Active item has path. Use project path for item path.
item.getPath = -> path.join(projectPaths[1], "a-file.txt")
atom.commands.dispatch(workspaceElement, "window:run-package-specs")
- expect(ipc.send).toHaveBeenCalledWith("run-package-specs", path.join(projectPaths[1], "spec"))
- ipc.send.reset()
+ expect(ipcRenderer.send).toHaveBeenCalledWith("run-package-specs", path.join(projectPaths[1], "spec"))
+ ipcRenderer.send.reset()
diff --git a/src/application-delegate.coffee b/src/application-delegate.coffee
index 59259d223..f87827886 100644
--- a/src/application-delegate.coffee
+++ b/src/application-delegate.coffee
@@ -1,69 +1,67 @@
_ = require 'underscore-plus'
-ipc = require 'ipc'
-remote = require 'remote'
-shell = require 'shell'
-webFrame = require 'web-frame'
+{ipcRenderer, remote, shell, webFrame} = require 'electron'
+ipcHelpers = require './ipc-helpers'
{Disposable} = require 'event-kit'
{getWindowLoadSettings, setWindowLoadSettings} = require './window-load-settings-helpers'
module.exports =
class ApplicationDelegate
open: (params) ->
- ipc.send('open', params)
+ ipcRenderer.send('open', params)
pickFolder: (callback) ->
responseChannel = "atom-pick-folder-response"
- ipc.on responseChannel, (path) ->
- ipc.removeAllListeners(responseChannel)
+ ipcRenderer.on responseChannel, (event, path) ->
+ ipcRenderer.removeAllListeners(responseChannel)
callback(path)
- ipc.send("pick-folder", responseChannel)
+ ipcRenderer.send("pick-folder", responseChannel)
getCurrentWindow: ->
remote.getCurrentWindow()
closeWindow: ->
- ipc.send("call-window-method", "close")
+ ipcRenderer.send("call-window-method", "close")
getWindowSize: ->
[width, height] = remote.getCurrentWindow().getSize()
{width, height}
setWindowSize: (width, height) ->
- remote.getCurrentWindow().setSize(width, height)
+ ipcHelpers.call('set-window-size', width, height)
getWindowPosition: ->
[x, y] = remote.getCurrentWindow().getPosition()
{x, y}
setWindowPosition: (x, y) ->
- ipc.send("call-window-method", "setPosition", x, y)
+ ipcHelpers.call('set-window-position', x, y)
centerWindow: ->
- ipc.send("call-window-method", "center")
+ ipcHelpers.call('center-window')
focusWindow: ->
- ipc.send("call-window-method", "focus")
+ ipcHelpers.call('focus-window')
showWindow: ->
- ipc.send("call-window-method", "show")
+ ipcHelpers.call('show-window')
hideWindow: ->
- ipc.send("call-window-method", "hide")
+ ipcHelpers.call('hide-window')
- restartWindow: ->
- ipc.send("call-window-method", "restart")
+ reloadWindow: ->
+ ipcRenderer.send("call-window-method", "reload")
isWindowMaximized: ->
remote.getCurrentWindow().isMaximized()
maximizeWindow: ->
- ipc.send("call-window-method", "maximize")
+ ipcRenderer.send("call-window-method", "maximize")
isWindowFullScreen: ->
remote.getCurrentWindow().isFullScreen()
setWindowFullScreen: (fullScreen=false) ->
- ipc.send("call-window-method", "setFullScreen", fullScreen)
+ ipcRenderer.send("call-window-method", "setFullScreen", fullScreen)
openWindowDevTools: ->
new Promise (resolve) ->
@@ -75,7 +73,7 @@ class ApplicationDelegate
resolve()
else
remote.getCurrentWindow().once("devtools-opened", -> resolve())
- ipc.send("call-window-method", "openDevTools")
+ ipcRenderer.send("call-window-method", "openDevTools")
closeWindowDevTools: ->
new Promise (resolve) ->
@@ -87,7 +85,7 @@ class ApplicationDelegate
resolve()
else
remote.getCurrentWindow().once("devtools-closed", -> resolve())
- ipc.send("call-window-method", "closeDevTools")
+ ipcRenderer.send("call-window-method", "closeDevTools")
toggleWindowDevTools: ->
new Promise (resolve) =>
@@ -101,16 +99,16 @@ class ApplicationDelegate
@openWindowDevTools().then(resolve)
executeJavaScriptInWindowDevTools: (code) ->
- ipc.send("call-window-method", "executeJavaScriptInDevTools", code)
+ ipcRenderer.send("execute-javascript-in-dev-tools", code)
setWindowDocumentEdited: (edited) ->
- ipc.send("call-window-method", "setDocumentEdited", edited)
+ ipcRenderer.send("call-window-method", "setDocumentEdited", edited)
setRepresentedFilename: (filename) ->
- ipc.send("call-window-method", "setRepresentedFilename", filename)
+ ipcRenderer.send("call-window-method", "setRepresentedFilename", filename)
addRecentDocument: (filename) ->
- ipc.send("add-recent-document", filename)
+ ipcRenderer.send("add-recent-document", filename)
setRepresentedDirectoryPaths: (paths) ->
loadSettings = getWindowLoadSettings()
@@ -118,14 +116,13 @@ class ApplicationDelegate
setWindowLoadSettings(loadSettings)
setAutoHideWindowMenuBar: (autoHide) ->
- ipc.send("call-window-method", "setAutoHideMenuBar", autoHide)
+ ipcRenderer.send("call-window-method", "setAutoHideMenuBar", autoHide)
setWindowMenuBarVisibility: (visible) ->
remote.getCurrentWindow().setMenuBarVisibility(visible)
getPrimaryDisplayWorkAreaSize: ->
- screen = remote.require 'screen'
- screen.getPrimaryDisplay().workAreaSize
+ remote.screen.getPrimaryDisplay().workAreaSize
confirm: ({message, detailedMessage, buttons}) ->
buttons ?= {}
@@ -134,8 +131,7 @@ class ApplicationDelegate
else
buttonLabels = Object.keys(buttons)
- dialog = remote.require('dialog')
- chosen = dialog.showMessageBox(remote.getCurrentWindow(), {
+ chosen = remote.dialog.showMessageBox(remote.getCurrentWindow(), {
type: 'info'
message: message
detail: detailedMessage
@@ -157,42 +153,47 @@ class ApplicationDelegate
params = _.clone(params)
params.title ?= 'Save File'
params.defaultPath ?= getWindowLoadSettings().initialPaths[0]
- dialog = remote.require('dialog')
- dialog.showSaveDialog remote.getCurrentWindow(), params
+ remote.dialog.showSaveDialog remote.getCurrentWindow(), params
playBeepSound: ->
shell.beep()
onDidOpenLocations: (callback) ->
- outerCallback = (message, detail) ->
+ outerCallback = (event, message, detail) ->
if message is 'open-locations'
callback(detail)
- ipc.on('message', outerCallback)
+ ipcRenderer.on('message', outerCallback)
new Disposable ->
- ipc.removeListener('message', outerCallback)
+ ipcRenderer.removeListener('message', outerCallback)
onUpdateAvailable: (callback) ->
- outerCallback = (message, detail) ->
+ outerCallback = (event, message, detail) ->
if message is 'update-available'
callback(detail)
- ipc.on('message', outerCallback)
+ ipcRenderer.on('message', outerCallback)
new Disposable ->
- ipc.removeListener('message', outerCallback)
+ ipcRenderer.removeListener('message', outerCallback)
onApplicationMenuCommand: (callback) ->
- ipc.on('command', callback)
+ outerCallback = (event, args...) ->
+ callback(args...)
+
+ ipcRenderer.on('command', outerCallback)
new Disposable ->
- ipc.removeListener('command', callback)
+ ipcRenderer.removeListener('command', outerCallback)
onContextMenuCommand: (callback) ->
- ipc.on('context-command', callback)
+ outerCallback = (event, args...) ->
+ callback(args...)
+
+ ipcRenderer.on('context-command', outerCallback)
new Disposable ->
- ipc.removeListener('context-command', callback)
+ ipcRenderer.removeListener('context-command', outerCallback)
didCancelWindowUnload: ->
- ipc.send('did-cancel-window-unload')
+ ipcRenderer.send('did-cancel-window-unload')
openExternal: (url) ->
shell.openExternal(url)
diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index ed36f5da2..8c2d3e73d 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -1,6 +1,6 @@
crypto = require 'crypto'
path = require 'path'
-ipc = require 'ipc'
+{ipcRenderer} = require 'electron'
_ = require 'underscore-plus'
{deprecate} = require 'grim'
@@ -211,10 +211,10 @@ class AtomEnvironment extends Model
checkPortableHomeWritable = ->
responseChannel = "check-portable-home-writable-response"
- ipc.on responseChannel, (response) ->
- ipc.removeAllListeners(responseChannel)
+ ipcRenderer.on responseChannel, (event, response) ->
+ ipcRenderer.removeAllListeners(responseChannel)
atom.notifications.addWarning("#{response.message.replace(/([\\\.+\\-_#!])/g, '\\$1')}") if not response.writable
- ipc.send('check-portable-home-writable', responseChannel)
+ ipcRenderer.send('check-portable-home-writable', responseChannel)
checkPortableHomeWritable()
@@ -507,7 +507,7 @@ class AtomEnvironment extends Model
# Extended: Reload the current window.
reload: ->
- @applicationDelegate.restartWindow()
+ @applicationDelegate.reloadWindow()
# Extended: Returns a {Boolean} that is `true` if the current window is maximized.
isMaximized: ->
@@ -534,16 +534,18 @@ class AtomEnvironment extends Model
# Restore the window to its previous dimensions and show it.
#
- # Also restores the full screen and maximized state on the next tick to
+ # Restores the full screen and maximized state after the window has resized to
# prevent resize glitches.
displayWindow: ->
- dimensions = @restoreWindowDimensions()
- @show()
- @focus()
-
- setImmediate =>
- @setFullScreen(true) if @workspace?.fullScreen
- @maximize() if dimensions?.maximized and process.platform isnt 'darwin'
+ @restoreWindowDimensions().then (dimensions) =>
+ steps = [
+ @restoreWindowBackground(),
+ @show(),
+ @focus()
+ ]
+ steps.push(@setFullScreen(true)) if @workspace.fullScreen
+ steps.push(@maximize()) if dimensions?.maximized and process.platform isnt 'darwin'
+ Promise.all(steps)
if @isFirstLoad()
loadSettings = getWindowLoadSettings()
@@ -576,12 +578,14 @@ class AtomEnvironment extends Model
# * `width` The new width.
# * `height` The new height.
setWindowDimensions: ({x, y, width, height}) ->
+ steps = []
if width? and height?
- @setSize(width, height)
+ steps.push(@setSize(width, height))
if x? and y?
- @setPosition(x, y)
+ steps.push(@setPosition(x, y))
else
- @center()
+ steps.push(@center())
+ Promise.all(steps)
# Returns true if the dimensions are useable, false if they should be ignored.
# Work around for https://github.com/atom/atom-shell/issues/473
@@ -621,13 +625,19 @@ class AtomEnvironment extends Model
unless @isValidDimensions(dimensions)
dimensions = @getDefaultWindowDimensions()
- @setWindowDimensions(dimensions)
- dimensions
+ @setWindowDimensions(dimensions).then -> dimensions
storeWindowDimensions: ->
dimensions = @getWindowDimensions()
@windowDimensions = dimensions if @isValidDimensions(dimensions)
+ restoreWindowBackground: ->
+ if backgroundColor = window.localStorage.getItem('atom:window-background-color')
+ @backgroundStylesheet = document.createElement('style')
+ @backgroundStylesheet.type = 'text/css'
+ @backgroundStylesheet.innerText = 'html, body { background: ' + backgroundColor + ' !important; }'
+ document.head.appendChild(@backgroundStylesheet)
+
storeWindowBackground: ->
return if @inSpecMode()
@@ -652,6 +662,7 @@ class AtomEnvironment extends Model
@packages.loadPackages()
@document.body.appendChild(@views.getView(@workspace))
+ @backgroundStylesheet?.remove()
@watchProjectPath()
diff --git a/src/browser/application-menu.coffee b/src/browser/application-menu.coffee
index 74da80e43..b0a6e3267 100644
--- a/src/browser/application-menu.coffee
+++ b/src/browser/application-menu.coffee
@@ -1,6 +1,4 @@
-app = require 'app'
-ipc = require 'ipc'
-Menu = require 'menu'
+{app, Menu} = require 'electron'
_ = require 'underscore-plus'
# Used to manage the global application menu.
diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index e889840e5..93dd428ce 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -2,14 +2,10 @@ AtomWindow = require './atom-window'
ApplicationMenu = require './application-menu'
AtomProtocolHandler = require './atom-protocol-handler'
AutoUpdateManager = require './auto-update-manager'
-BrowserWindow = require 'browser-window'
StorageFolder = require '../storage-folder'
-Menu = require 'menu'
-app = require 'app'
-dialog = require 'dialog'
-shell = require 'shell'
+ipcHelpers = require '../ipc-helpers'
+{BrowserWindow, Menu, app, dialog, ipcMain, shell} = require 'electron'
fs = require 'fs-plus'
-ipc = require 'ipc'
path = require 'path'
os = require 'os'
net = require 'net'
@@ -51,7 +47,7 @@ class AtomApplication
client = net.connect {path: options.socketPath}, ->
client.write JSON.stringify(options), ->
client.end()
- app.terminate()
+ app.quit()
client.on 'error', createAtomApplication
@@ -212,7 +208,6 @@ class AtomApplication
@openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
app.on 'before-quit', =>
- @saveState(false)
@quitting = true
app.on 'will-quit', =>
@@ -232,7 +227,7 @@ class AtomApplication
@emit('application:new-window')
# A request from the associated render process to open a new render process.
- ipc.on 'open', (event, options) =>
+ ipcMain.on 'open', (event, options) =>
window = @windowForEvent(event)
if options?
if typeof options.pathsToOpen is 'string'
@@ -245,44 +240,65 @@ class AtomApplication
else
@promptForPathToOpen('all', {window})
- ipc.on 'update-application-menu', (event, template, keystrokesByCommand) =>
+ ipcMain.on 'update-application-menu', (event, template, keystrokesByCommand) =>
win = BrowserWindow.fromWebContents(event.sender)
@applicationMenu.update(win, template, keystrokesByCommand)
- ipc.on 'run-package-specs', (event, packageSpecPath) =>
+ ipcMain.on 'run-package-specs', (event, packageSpecPath) =>
@runTests({resourcePath: @devResourcePath, pathsToOpen: [packageSpecPath], headless: false})
- ipc.on 'command', (event, command) =>
+ ipcMain.on 'command', (event, command) =>
@emit(command)
- ipc.on 'window-command', (event, command, args...) ->
+ ipcMain.on 'window-command', (event, command, args...) ->
win = BrowserWindow.fromWebContents(event.sender)
win.emit(command, args...)
- ipc.on 'call-window-method', (event, method, args...) ->
+ ipcMain.on 'call-window-method', (event, method, args...) ->
win = BrowserWindow.fromWebContents(event.sender)
win[method](args...)
- ipc.on 'pick-folder', (event, responseChannel) =>
+ ipcMain.on 'pick-folder', (event, responseChannel) =>
@promptForPath "folder", (selectedPaths) ->
event.sender.send(responseChannel, selectedPaths)
- ipc.on 'did-cancel-window-unload', =>
+ ipcHelpers.respondTo 'set-window-size', (win, width, height) ->
+ win.setSize(width, height)
+
+ ipcHelpers.respondTo 'set-window-position', (win, x, y) ->
+ win.setPosition(x, y)
+
+ ipcHelpers.respondTo 'center-window', (win) ->
+ win.center()
+
+ ipcHelpers.respondTo 'focus-window', (win) ->
+ win.focus()
+
+ ipcHelpers.respondTo 'show-window', (win) ->
+ win.show()
+
+ ipcHelpers.respondTo 'hide-window', (win) ->
+ win.hide()
+
+ ipcMain.on 'did-cancel-window-unload', =>
@quitting = false
clipboard = require '../safe-clipboard'
- ipc.on 'write-text-to-selection-clipboard', (event, selectedText) ->
+ ipcMain.on 'write-text-to-selection-clipboard', (event, selectedText) ->
clipboard.writeText(selectedText, 'selection')
- ipc.on 'write-to-stdout', (event, output) ->
+ ipcMain.on 'write-to-stdout', (event, output) ->
process.stdout.write(output)
- ipc.on 'write-to-stderr', (event, output) ->
+ ipcMain.on 'write-to-stderr', (event, output) ->
process.stderr.write(output)
- ipc.on 'add-recent-document', (event, filename) ->
+ ipcMain.on 'add-recent-document', (event, filename) ->
app.addRecentDocument(filename)
+ ipcMain.on 'execute-javascript-in-dev-tools', (event, code) ->
+ event.sender.devToolsWebContents?.executeJavaScript(code)
+
setupDockMenu: ->
if process.platform is 'darwin'
dockMenu = Menu.buildFromTemplate [
@@ -350,7 +366,7 @@ class AtomApplication
_.find @windows, (atomWindow) ->
atomWindow.devMode is devMode and atomWindow.containsPaths(pathsToOpen)
- # Returns the {AtomWindow} for the given ipc event.
+ # Returns the {AtomWindow} for the given ipcMain event.
windowForEvent: ({sender}) ->
window = BrowserWindow.fromWebContents(sender)
_.find @windows, ({browserWindow}) -> window is browserWindow
diff --git a/src/browser/atom-portable.coffee b/src/browser/atom-portable.coffee
index 5f8f10cf6..ae4bb67ec 100644
--- a/src/browser/atom-portable.coffee
+++ b/src/browser/atom-portable.coffee
@@ -1,6 +1,6 @@
fs = require 'fs-plus'
path = require 'path'
-ipc = require 'ipc'
+{ipcMain} = require 'electron'
module.exports =
class AtomPortable
@@ -30,6 +30,6 @@ class AtomPortable
catch error
message = "Failed to use portable Atom home directory (#{@getPortableAtomHomePath()}). Using the default instead (#{defaultHome}). #{error.message}"
- ipc.on 'check-portable-home-writable', (event) ->
+ ipcMain.on 'check-portable-home-writable', (event) ->
event.sender.send 'check-portable-home-writable-response', {writable, message}
writable
diff --git a/src/browser/atom-protocol-handler.coffee b/src/browser/atom-protocol-handler.coffee
index 0fda8095b..3967c0525 100644
--- a/src/browser/atom-protocol-handler.coffee
+++ b/src/browser/atom-protocol-handler.coffee
@@ -1,7 +1,6 @@
-app = require 'app'
+{app, protocol} = require 'electron'
fs = require 'fs'
path = require 'path'
-protocol = require 'protocol'
# Handles requests with 'atom' protocol.
#
diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee
index 0c0f8f919..828366c4f 100644
--- a/src/browser/atom-window.coffee
+++ b/src/browser/atom-window.coffee
@@ -1,6 +1,4 @@
-BrowserWindow = require 'browser-window'
-app = require 'app'
-dialog = require 'dialog'
+{BrowserWindow, app, dialog} = require 'electron'
path = require 'path'
fs = require 'fs'
url = require 'url'
@@ -83,7 +81,7 @@ class AtomWindow
loadSettings = _.clone(loadSettingsObj)
delete loadSettings['windowState']
- @browserWindow.loadUrl url.format
+ @browserWindow.loadURL url.format
protocol: 'file'
pathname: "#{@resourcePath}/static/index.html"
slashes: true
@@ -91,7 +89,7 @@ class AtomWindow
getLoadSettings: ->
if @browserWindow.webContents? and not @browserWindow.webContents.isLoading()
- hash = url.parse(@browserWindow.webContents.getUrl()).hash.substr(1)
+ hash = url.parse(@browserWindow.webContents.getURL()).hash.substr(1)
JSON.parse(decodeURIComponent(hash))
hasProjectPath: -> @getLoadSettings().initialPaths?.length > 0
@@ -123,6 +121,9 @@ class AtomWindow
false
handleEvents: ->
+ @browserWindow.on 'close', ->
+ global.atomApplication.saveState(false)
+
@browserWindow.on 'closed', =>
global.atomApplication.removeWindow(this)
@@ -146,10 +147,10 @@ class AtomWindow
detail: 'Please report this issue to https://github.com/atom/atom'
switch chosen
when 0 then @browserWindow.destroy()
- when 1 then @browserWindow.restart()
+ when 1 then @browserWindow.reload()
@browserWindow.webContents.on 'will-navigate', (event, url) =>
- unless url is @browserWindow.webContents.getUrl()
+ unless url is @browserWindow.webContents.getURL()
event.preventDefault()
@setupContextMenu()
@@ -222,6 +223,6 @@ class AtomWindow
isSpecWindow: -> @isSpec
- reload: -> @browserWindow.restart()
+ reload: -> @browserWindow.reload()
toggleDevTools: -> @browserWindow.toggleDevTools()
diff --git a/src/browser/auto-update-manager.coffee b/src/browser/auto-update-manager.coffee
index 6a008d44d..2df338761 100644
--- a/src/browser/auto-update-manager.coffee
+++ b/src/browser/auto-update-manager.coffee
@@ -29,13 +29,13 @@ class AutoUpdateManager
if process.platform is 'win32'
autoUpdater = require './auto-updater-win32'
else
- autoUpdater = require 'auto-updater'
+ {autoUpdater} = require 'electron'
autoUpdater.on 'error', (event, message) =>
@setState(ErrorState)
console.error "Error Downloading Update: #{message}"
- autoUpdater.setFeedUrl @feedUrl
+ autoUpdater.setFeedURL @feedUrl
autoUpdater.on 'checking-for-update', =>
@setState(CheckingState)
@@ -104,7 +104,7 @@ class AutoUpdateManager
onUpdateNotAvailable: =>
autoUpdater.removeListener 'error', @onUpdateError
- dialog = require 'dialog'
+ {dialog} = require 'electron'
dialog.showMessageBox
type: 'info'
buttons: ['OK']
@@ -115,7 +115,7 @@ class AutoUpdateManager
onUpdateError: (event, message) =>
autoUpdater.removeListener 'update-not-available', @onUpdateNotAvailable
- dialog = require 'dialog'
+ {dialog} = require 'electron'
dialog.showMessageBox
type: 'warning'
buttons: ['OK']
diff --git a/src/browser/auto-updater-win32.coffee b/src/browser/auto-updater-win32.coffee
index 4d043ac4e..e31578d49 100644
--- a/src/browser/auto-updater-win32.coffee
+++ b/src/browser/auto-updater-win32.coffee
@@ -5,13 +5,13 @@ SquirrelUpdate = require './squirrel-update'
class AutoUpdater
_.extend @prototype, EventEmitter.prototype
- setFeedUrl: (@updateUrl) ->
+ setFeedURL: (@updateUrl) ->
quitAndInstall: ->
if SquirrelUpdate.existsSync()
- SquirrelUpdate.restartAtom(require('app'))
+ SquirrelUpdate.restartAtom(require('electron').app)
else
- require('auto-updater').quitAndInstall()
+ require('electron').autoUpdater.quitAndInstall()
downloadUpdate: (callback) ->
SquirrelUpdate.spawn ['--download', @updateUrl], (error, stdout) ->
diff --git a/src/browser/context-menu.coffee b/src/browser/context-menu.coffee
index 44b57cdc9..1bc9c29ba 100644
--- a/src/browser/context-menu.coffee
+++ b/src/browser/context-menu.coffee
@@ -1,4 +1,4 @@
-Menu = require 'menu'
+{Menu} = require 'electron'
module.exports =
class ContextMenu
diff --git a/src/browser/main.coffee b/src/browser/main.coffee
index c0613fb09..20f5bb046 100644
--- a/src/browser/main.coffee
+++ b/src/browser/main.coffee
@@ -4,8 +4,7 @@ process.on 'uncaughtException', (error={}) ->
console.log(error.message) if error.message?
console.log(error.stack) if error.stack?
-crashReporter = require 'crash-reporter'
-app = require 'app'
+{crashReporter, app} = require 'electron'
fs = require 'fs-plus'
path = require 'path'
yargs = require 'yargs'
@@ -57,12 +56,12 @@ handleStartupEventWithSquirrel = ->
SquirrelUpdate.handleStartupEvent(app, squirrelCommand)
setupCrashReporter = ->
- crashReporter.start(productName: 'Atom', companyName: 'GitHub')
+ crashReporter.start(productName: 'Atom', companyName: 'GitHub', submitURL: 'http://54.249.141.255:1127/post')
setupAtomHome = ({setPortable}) ->
return if process.env.ATOM_HOME
- atomHome = path.join(app.getHomeDir(), '.atom')
+ atomHome = path.join(app.getPath('home'), '.atom')
AtomPortable = require './atom-portable'
if setPortable and not AtomPortable.isPortableInstall(process.platform, process.env.ATOM_HOME, atomHome)
@@ -149,7 +148,7 @@ parseCommandLine = ->
profileStartup = args['profile-startup']
clearWindowState = args['clear-window-state']
urlsToOpen = []
- devResourcePath = process.env.ATOM_DEV_RESOURCE_PATH ? path.join(app.getHomeDir(), 'github', 'atom')
+ devResourcePath = process.env.ATOM_DEV_RESOURCE_PATH ? path.join(app.getPath('home'), 'github', 'atom')
setPortable = args.portable
if args['resource-path']
diff --git a/src/context-menu-manager.coffee b/src/context-menu-manager.coffee
index 1d80dec09..936a9c6b6 100644
--- a/src/context-menu-manager.coffee
+++ b/src/context-menu-manager.coffee
@@ -4,7 +4,7 @@ CSON = require 'season'
fs = require 'fs-plus'
{calculateSpecificity, validateSelector} = require 'clear-cut'
{Disposable} = require 'event-kit'
-remote = require 'remote'
+{remote} = require 'electron'
MenuHelpers = require './menu-helpers'
platformContextMenu = require('../package.json')?._atomMenu?['context-menu']
diff --git a/src/initialize-application-window.coffee b/src/initialize-application-window.coffee
index e4fa4af4d..61f0c2439 100644
--- a/src/initialize-application-window.coffee
+++ b/src/initialize-application-window.coffee
@@ -24,11 +24,11 @@ module.exports = ({blobStore}) ->
})
atom.loadState().then ->
- atom.displayWindow()
- atom.startEditorWindow()
+ atom.displayWindow().then ->
+ atom.startEditorWindow()
- # Workaround for focus getting cleared upon window creation
- windowFocused = ->
- window.removeEventListener('focus', windowFocused)
- setTimeout (-> document.querySelector('atom-workspace').focus()), 0
- window.addEventListener('focus', windowFocused)
+ # Workaround for focus getting cleared upon window creation
+ windowFocused = ->
+ window.removeEventListener('focus', windowFocused)
+ setTimeout (-> document.querySelector('atom-workspace').focus()), 0
+ window.addEventListener('focus', windowFocused)
diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee
index bdd94461a..690180fc8 100644
--- a/src/initialize-test-window.coffee
+++ b/src/initialize-test-window.coffee
@@ -4,17 +4,17 @@ cloneObject = (object) ->
clone
module.exports = ({blobStore}) ->
+ {crashReporter, remote} = require 'electron'
# Start the crash reporter before anything else.
- require('crash-reporter').start(productName: 'Atom', companyName: 'GitHub')
- remote = require 'remote'
+ crashReporter.start(productName: 'Atom', companyName: 'GitHub', submitURL: 'http://54.249.141.255:1127/post')
exitWithStatusCode = (status) ->
- remote.require('app').emit('will-quit')
+ remote.app.emit('will-quit')
remote.process.exit(status)
try
path = require 'path'
- ipc = require 'ipc'
+ {ipcRenderer} = require 'electron'
{getWindowLoadSettings} = require './window-load-settings-helpers'
AtomEnvironment = require '../src/atom-environment'
ApplicationDelegate = require '../src/application-delegate'
@@ -29,15 +29,15 @@ module.exports = ({blobStore}) ->
handleKeydown = (event) ->
# Reload: cmd-r / ctrl-r
if (event.metaKey or event.ctrlKey) and event.keyCode is 82
- ipc.send('call-window-method', 'restart')
+ ipcRenderer.send('call-window-method', 'reload')
# Toggle Dev Tools: cmd-alt-i / ctrl-alt-i
if (event.metaKey or event.ctrlKey) and event.altKey and event.keyCode is 73
- ipc.send('call-window-method', 'toggleDevTools')
+ ipcRenderer.send('call-window-method', 'toggleDevTools')
# Reload: cmd-w / ctrl-w
if (event.metaKey or event.ctrlKey) and event.keyCode is 87
- ipc.send('call-window-method', 'close')
+ ipcRenderer.send('call-window-method', 'close')
window.addEventListener('keydown', handleKeydown, true)
@@ -70,7 +70,6 @@ module.exports = ({blobStore}) ->
promise.then (statusCode) ->
exitWithStatusCode(statusCode) if getWindowLoadSettings().headless
-
catch error
if getWindowLoadSettings().headless
console.error(error.stack ? error)
diff --git a/src/ipc-helpers.js b/src/ipc-helpers.js
new file mode 100644
index 000000000..c0b38c50e
--- /dev/null
+++ b/src/ipc-helpers.js
@@ -0,0 +1,40 @@
+var ipcRenderer = null
+var ipcMain = null
+var BrowserWindow = null
+
+exports.call = function (methodName, ...args) {
+ if (!ipcRenderer) {
+ ipcRenderer = require('electron').ipcRenderer
+ }
+
+ var responseChannel = getResponseChannel(methodName)
+
+ return new Promise(function (resolve) {
+ ipcRenderer.on(responseChannel, function (event, result) {
+ ipcRenderer.removeAllListeners(responseChannel)
+ resolve(result)
+ })
+
+ ipcRenderer.send(methodName, ...args)
+ })
+}
+
+exports.respondTo = function (methodName, callback) {
+ if (!ipcMain) {
+ var electron = require('electron')
+ ipcMain = electron.ipcMain
+ BrowserWindow = electron.BrowserWindow
+ }
+
+ var responseChannel = getResponseChannel(methodName)
+
+ ipcMain.on(methodName, function (event, ...args) {
+ var browserWindow = BrowserWindow.fromWebContents(event.sender)
+ var result = callback(browserWindow, ...args)
+ event.sender.send(responseChannel, result)
+ })
+}
+
+function getResponseChannel (methodName) {
+ return 'ipc-helpers-' + methodName + '-response'
+}
diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee
index fa78d3cd6..67076dbfa 100644
--- a/src/menu-manager.coffee
+++ b/src/menu-manager.coffee
@@ -1,7 +1,7 @@
path = require 'path'
_ = require 'underscore-plus'
-ipc = require 'ipc'
+{ipcRenderer} = require 'electron'
CSON = require 'season'
fs = require 'fs-plus'
{Disposable} = require 'event-kit'
@@ -191,7 +191,7 @@ class MenuManager
sendToBrowserProcess: (template, keystrokesByCommand) ->
keystrokesByCommand = @filterMultipleKeystroke(keystrokesByCommand)
- ipc.send 'update-application-menu', template, keystrokesByCommand
+ ipcRenderer.send 'update-application-menu', template, keystrokesByCommand
# Get an {Array} of {String} classes for the given element.
classesForElement: (element) ->
diff --git a/src/module-cache.coffee b/src/module-cache.coffee
index e9245cf40..a2840a864 100644
--- a/src/module-cache.coffee
+++ b/src/module-cache.coffee
@@ -208,7 +208,7 @@ registerBuiltins = (devMode) ->
cache.builtins[builtin] = path.join(commonRoot, "#{builtin}.js")
rendererRoot = path.join(atomShellRoot, 'renderer', 'api', 'lib')
- rendererBuiltins = ['ipc', 'remote']
+ rendererBuiltins = ['ipc-renderer', 'remote']
for builtin in rendererBuiltins
cache.builtins[builtin] = path.join(rendererRoot, "#{builtin}.js")
diff --git a/src/register-default-commands.coffee b/src/register-default-commands.coffee
index 32c74569b..1b1aad2cf 100644
--- a/src/register-default-commands.coffee
+++ b/src/register-default-commands.coffee
@@ -1,4 +1,4 @@
-ipc = require 'ipc'
+{ipcRenderer} = require 'electron'
module.exports = ({commandRegistry, commandInstaller, config}) ->
commandRegistry.add 'atom-workspace',
@@ -18,30 +18,30 @@ module.exports = ({commandRegistry, commandInstaller, config}) ->
'window:increase-font-size': -> @getModel().increaseFontSize()
'window:decrease-font-size': -> @getModel().decreaseFontSize()
'window:reset-font-size': -> @getModel().resetFontSize()
- 'application:about': -> ipc.send('command', 'application:about')
- 'application:show-preferences': -> ipc.send('command', 'application:show-settings')
- 'application:show-settings': -> ipc.send('command', 'application:show-settings')
- 'application:quit': -> ipc.send('command', 'application:quit')
- 'application:hide': -> ipc.send('command', 'application:hide')
- 'application:hide-other-applications': -> ipc.send('command', 'application:hide-other-applications')
- 'application:install-update': -> ipc.send('command', 'application:install-update')
- 'application:unhide-all-applications': -> ipc.send('command', 'application:unhide-all-applications')
- 'application:new-window': -> ipc.send('command', 'application:new-window')
- 'application:new-file': -> ipc.send('command', 'application:new-file')
- 'application:open': -> ipc.send('command', 'application:open')
- 'application:open-file': -> ipc.send('command', 'application:open-file')
- 'application:open-folder': -> ipc.send('command', 'application:open-folder')
- 'application:open-dev': -> ipc.send('command', 'application:open-dev')
- 'application:open-safe': -> ipc.send('command', 'application:open-safe')
+ 'application:about': -> ipcRenderer.send('command', 'application:about')
+ 'application:show-preferences': -> ipcRenderer.send('command', 'application:show-settings')
+ 'application:show-settings': -> ipcRenderer.send('command', 'application:show-settings')
+ 'application:quit': -> ipcRenderer.send('command', 'application:quit')
+ 'application:hide': -> ipcRenderer.send('command', 'application:hide')
+ 'application:hide-other-applications': -> ipcRenderer.send('command', 'application:hide-other-applications')
+ 'application:install-update': -> ipcRenderer.send('command', 'application:install-update')
+ 'application:unhide-all-applications': -> ipcRenderer.send('command', 'application:unhide-all-applications')
+ 'application:new-window': -> ipcRenderer.send('command', 'application:new-window')
+ 'application:new-file': -> ipcRenderer.send('command', 'application:new-file')
+ 'application:open': -> ipcRenderer.send('command', 'application:open')
+ 'application:open-file': -> ipcRenderer.send('command', 'application:open-file')
+ 'application:open-folder': -> ipcRenderer.send('command', 'application:open-folder')
+ 'application:open-dev': -> ipcRenderer.send('command', 'application:open-dev')
+ 'application:open-safe': -> ipcRenderer.send('command', 'application:open-safe')
'application:add-project-folder': -> atom.addProjectFolder()
- 'application:minimize': -> ipc.send('command', 'application:minimize')
- 'application:zoom': -> ipc.send('command', 'application:zoom')
- 'application:bring-all-windows-to-front': -> ipc.send('command', 'application:bring-all-windows-to-front')
- 'application:open-your-config': -> ipc.send('command', 'application:open-your-config')
- 'application:open-your-init-script': -> ipc.send('command', 'application:open-your-init-script')
- 'application:open-your-keymap': -> ipc.send('command', 'application:open-your-keymap')
- 'application:open-your-snippets': -> ipc.send('command', 'application:open-your-snippets')
- 'application:open-your-stylesheet': -> ipc.send('command', 'application:open-your-stylesheet')
+ 'application:minimize': -> ipcRenderer.send('command', 'application:minimize')
+ 'application:zoom': -> ipcRenderer.send('command', 'application:zoom')
+ 'application:bring-all-windows-to-front': -> ipcRenderer.send('command', 'application:bring-all-windows-to-front')
+ 'application:open-your-config': -> ipcRenderer.send('command', 'application:open-your-config')
+ 'application:open-your-init-script': -> ipcRenderer.send('command', 'application:open-your-init-script')
+ 'application:open-your-keymap': -> ipcRenderer.send('command', 'application:open-your-keymap')
+ 'application:open-your-snippets': -> ipcRenderer.send('command', 'application:open-your-snippets')
+ 'application:open-your-stylesheet': -> ipcRenderer.send('command', 'application:open-your-stylesheet')
'application:open-license': -> @getModel().openLicense()
'window:run-package-specs': -> @runPackageSpecs()
'window:focus-next-pane': -> @getModel().activateNextPane()
diff --git a/src/safe-clipboard.coffee b/src/safe-clipboard.coffee
index 8301f9d54..1f91803e2 100644
--- a/src/safe-clipboard.coffee
+++ b/src/safe-clipboard.coffee
@@ -1,6 +1,6 @@
# Using clipboard in renderer process is not safe on Linux.
module.exports =
if process.platform is 'linux' and process.type is 'renderer'
- require('remote').require('clipboard')
+ require('electron').remote.clipboard
else
- require('clipboard')
+ require('electron').clipboard
diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index 4a51badbd..bdd0befcd 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -2,7 +2,7 @@ _ = require 'underscore-plus'
scrollbarStyle = require 'scrollbar-style'
{Range, Point} = require 'text-buffer'
{CompositeDisposable} = require 'event-kit'
-ipc = require 'ipc'
+{ipcRenderer} = require 'electron'
TextEditorPresenter = require './text-editor-presenter'
GutterContainerComponent = require './gutter-container-component'
@@ -279,10 +279,10 @@ class TextEditorComponent
writeSelectedTextToSelectionClipboard = =>
return if @editor.isDestroyed()
if selectedText = @editor.getSelectedText()
- # This uses ipc.send instead of clipboard.writeText because
- # clipboard.writeText is a sync ipc call on Linux and that
+ # This uses ipcRenderer.send instead of clipboard.writeText because
+ # clipboard.writeText is a sync ipcRenderer call on Linux and that
# will slow down selections.
- ipc.send('write-text-to-selection-clipboard', selectedText)
+ ipcRenderer.send('write-text-to-selection-clipboard', selectedText)
@disposables.add @editor.onDidChangeSelectionRange ->
clearTimeout(timeoutId)
timeoutId = setTimeout(writeSelectedTextToSelectionClipboard)
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index b13bf9036..a36c860ed 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -432,18 +432,14 @@ class TextEditorPresenter
return
updateCursorsState: ->
- @state.content.cursors = {}
- @updateCursorState(cursor) for cursor in @model.cursors # using property directly to avoid allocation
- return
-
- updateCursorState: (cursor) ->
return unless @startRow? and @endRow? and @hasPixelRectRequirements() and @baseCharacterWidth?
- screenRange = cursor.getScreenRange()
- return unless cursor.isVisible() and @startRow <= screenRange.start.row < @endRow
- pixelRect = @pixelRectForScreenRange(screenRange)
- pixelRect.width = Math.round(@baseCharacterWidth) if pixelRect.width is 0
- @state.content.cursors[cursor.id] = pixelRect
+ @state.content.cursors = {}
+ for cursor in @model.cursorsForScreenRowRange(@startRow, @endRow - 1) when cursor.isVisible()
+ pixelRect = @pixelRectForScreenRange(cursor.getScreenRange())
+ pixelRect.width = Math.round(@baseCharacterWidth) if pixelRect.width is 0
+ @state.content.cursors[cursor.id] = pixelRect
+ return
updateOverlaysState: ->
return unless @hasOverlayPositionRequirements()
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index 2ba45a3ba..55f6d84ad 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -109,6 +109,7 @@ class TextEditor extends Model
@emitter = new Emitter
@disposables = new CompositeDisposable
@cursors = []
+ @cursorsByMarkerId = new Map
@selections = []
buffer ?= new TextBuffer
@@ -1944,10 +1945,18 @@ class TextEditor extends Model
getCursorsOrderedByBufferPosition: ->
@getCursors().sort (a, b) -> a.compare(b)
+ cursorsForScreenRowRange: (startScreenRow, endScreenRow) ->
+ cursors = []
+ for marker in @selectionsMarkerLayer.findMarkers(intersectsScreenRowRange: [startScreenRow, endScreenRow])
+ if cursor = @cursorsByMarkerId.get(marker.id)
+ cursors.push(cursor)
+ cursors
+
# Add a cursor based on the given {TextEditorMarker}.
addCursor: (marker) ->
cursor = new Cursor(editor: this, marker: marker, config: @config)
@cursors.push(cursor)
+ @cursorsByMarkerId.set(marker.id, cursor)
@decorateMarker(marker, type: 'line-number', class: 'cursor-line')
@decorateMarker(marker, type: 'line-number', class: 'cursor-line-no-selection', onlyHead: true, onlyEmpty: true)
@decorateMarker(marker, type: 'line', class: 'cursor-line', onlyEmpty: true)
@@ -2446,6 +2455,7 @@ class TextEditor extends Model
removeSelection: (selection) ->
_.remove(@cursors, selection.cursor)
_.remove(@selections, selection)
+ @cursorsByMarkerId.delete(selection.cursor.marker.id)
@emitter.emit 'did-remove-cursor', selection.cursor
@emitter.emit 'did-remove-selection', selection
diff --git a/src/window-load-settings-helpers.coffee b/src/window-load-settings-helpers.coffee
index 59ee2f382..4bb514301 100644
--- a/src/window-load-settings-helpers.coffee
+++ b/src/window-load-settings-helpers.coffee
@@ -1,4 +1,4 @@
-remote = require 'remote'
+{remote} = require 'electron'
_ = require 'underscore-plus'
windowLoadSettings = null
diff --git a/src/workspace-element.coffee b/src/workspace-element.coffee
index f7805ed57..8f6dca48a 100644
--- a/src/workspace-element.coffee
+++ b/src/workspace-element.coffee
@@ -1,4 +1,4 @@
-ipc = require 'ipc'
+{ipcRenderer} = require 'electron'
path = require 'path'
{Disposable, CompositeDisposable} = require 'event-kit'
Grim = require 'grim'
@@ -117,6 +117,6 @@ class WorkspaceElement extends HTMLElement
[projectPath] = @project.relativizePath(activePath)
else
[projectPath] = @project.getPaths()
- ipc.send('run-package-specs', path.join(projectPath, 'spec')) if projectPath
+ ipcRenderer.send('run-package-specs', path.join(projectPath, 'spec')) if projectPath
module.exports = WorkspaceElement = document.registerElement 'atom-workspace', prototype: WorkspaceElement.prototype
diff --git a/static/index.html b/static/index.html
index 5fcb30ad2..0bd4a7954 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,7 +1,7 @@
-
+
diff --git a/static/index.js b/static/index.js
index 651c2afe6..c33eda67a 100644
--- a/static/index.js
+++ b/static/index.js
@@ -54,7 +54,7 @@
}
function handleSetupError (error) {
- var currentWindow = require('remote').getCurrentWindow()
+ var currentWindow = require('electron').remote.getCurrentWindow()
currentWindow.setSize(800, 600)
currentWindow.center()
currentWindow.show()
@@ -71,9 +71,10 @@
ModuleCache.add(loadSettings.resourcePath)
// Start the crash reporter before anything else.
- require('crash-reporter').start({
+ require('electron').crashReporter.start({
productName: 'Atom',
companyName: 'GitHub',
+ submitURL: 'http://54.249.141.255:1127/post',
// By explicitly passing the app version here, we could save the call
// of "require('remote').require('app').getVersion()".
extra: {_version: loadSettings.appVersion}
@@ -83,8 +84,8 @@
setupCsonCache(CompileCache.getCacheDirectory())
var initialize = require(loadSettings.windowInitializationScript)
- initialize({blobStore: blobStore}).then(function () {
- require('ipc').sendChannel('window-command', 'window:loaded')
+ return initialize({blobStore: blobStore}).then(function () {
+ require('electron').ipcRenderer.send('window-command', 'window:loaded')
})
}
@@ -113,19 +114,15 @@
function profileStartup (loadSettings, initialTime) {
function profile () {
console.profile('startup')
- try {
- var startTime = Date.now()
- setupWindow(loadSettings)
+ var startTime = Date.now()
+ setupWindow(loadSettings).then(function () {
setLoadTime(Date.now() - startTime + initialTime)
- } catch (error) {
- handleSetupError(error)
- } finally {
console.profileEnd('startup')
console.log('Switch to the Profiles tab to view the created startup profile')
- }
+ })
}
- var currentWindow = require('remote').getCurrentWindow()
+ var currentWindow = require('electron').remote.getCurrentWindow()
if (currentWindow.devToolsWebContents) {
profile()
} else {
@@ -146,31 +143,6 @@
}
}
- function setupWindowBackground () {
- if (loadSettings && loadSettings.isSpec) {
- return
- }
-
- var backgroundColor = window.localStorage.getItem('atom:window-background-color')
- if (!backgroundColor) {
- return
- }
-
- var backgroundStylesheet = document.createElement('style')
- backgroundStylesheet.type = 'text/css'
- backgroundStylesheet.innerText = 'html, body { background: ' + backgroundColor + ' !important; }'
- document.head.appendChild(backgroundStylesheet)
-
- // Remove once the page loads
- window.addEventListener('load', function loadWindow () {
- window.removeEventListener('load', loadWindow, false)
- setTimeout(function () {
- backgroundStylesheet.remove()
- backgroundStylesheet = null
- }, 1000)
- }, false)
- }
-
var setupAtomHome = function () {
if (process.env.ATOM_HOME) {
return
@@ -186,5 +158,4 @@
parseLoadSettings()
setupAtomHome()
- setupWindowBackground()
})()