Fix Electron deprecations

This commit is contained in:
Wliu
2015-11-17 21:16:09 -05:00
parent 74c0e79986
commit 6cd480b37e
22 changed files with 28 additions and 28 deletions

View File

@@ -1,5 +1,5 @@
_ = require 'underscore-plus'
ipc = require 'ipc'
ipc = require 'ipc-main'
remote = require 'remote'
shell = require 'shell'
webFrame = require 'web-frame'
@@ -72,7 +72,7 @@ class ApplicationDelegate
remote.getCurrentWindow().toggleDevTools()
executeJavaScriptInWindowDevTools: (code) ->
remote.getCurrentWindow().executeJavaScriptInDevTools(code)
remote.getCurrentWindow().webContents.executeJavaScriptInDevTools(code)
setWindowDocumentEdited: (edited) ->
ipc.send("call-window-method", "setDocumentEdited", edited)

View File

@@ -1,6 +1,6 @@
crypto = require 'crypto'
path = require 'path'
ipc = require 'ipc'
ipc = require 'ipc-main'
_ = require 'underscore-plus'
{deprecate} = require 'grim'
@@ -671,7 +671,7 @@ class AtomEnvironment extends Model
if openDevTools
@openDevTools()
@executeJavaScriptInDevTools('DevToolsAPI.showConsole()')
@webContents.executeJavaScriptInDevTools('DevToolsAPI.showConsole()')
@emitter.emit 'did-throw-error', {message, url, line, column, originalError}
@@ -729,7 +729,7 @@ class AtomEnvironment extends Model
@applicationDelegate.toggleWindowDevTools()
# Extended: Execute code in dev tools.
executeJavaScriptInDevTools: (code) ->
webContents.executeJavaScriptInDevTools: (code) ->
@applicationDelegate.executeJavaScriptInWindowDevTools(code)
###

View File

@@ -1,5 +1,5 @@
app = require 'app'
ipc = require 'ipc'
ipc = require 'ipc-main'
Menu = require 'menu'
_ = require 'underscore-plus'

View File

@@ -9,7 +9,7 @@ app = require 'app'
dialog = require 'dialog'
shell = require 'shell'
fs = require 'fs-plus'
ipc = require 'ipc'
ipc = require 'ipc-main'
path = require 'path'
os = require 'os'
net = require 'net'

View File

@@ -1,6 +1,6 @@
fs = require 'fs-plus'
path = require 'path'
ipc = require 'ipc'
ipc = require 'ipc-main'
module.exports =
class AtomPortable

View File

@@ -81,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

View File

@@ -31,7 +31,7 @@ class AutoUpdateManager
@setState(ErrorState)
console.error "Error Downloading Update: #{message}"
autoUpdater.setFeedUrl @feedUrl
autoUpdater.setFeedURL @feedUrl
autoUpdater.on 'checking-for-update', =>
@setState(CheckingState)

View File

@@ -5,7 +5,7 @@ SquirrelUpdate = require './squirrel-update'
class AutoUpdater
_.extend @prototype, EventEmitter.prototype
setFeedUrl: (@updateUrl) ->
setFeedURL: (@updateUrl) ->
quitAndInstall: ->
if SquirrelUpdate.existsSync()

View File

@@ -59,7 +59,7 @@ setupCrashReporter = ->
setupAtomHome = ({setPortable}) ->
return if process.env.ATOM_HOME
atomHome = path.join(app.getHomeDir(), '.atom')
atomHome = path.join(app.getPath(), '.atom')
AtomPortable = require './atom-portable'
if setPortable and not AtomPortable.isPortableInstall(process.platform, process.env.ATOM_HOME, atomHome)
@@ -142,7 +142,7 @@ parseCommandLine = ->
socketPath = args['socket-path']
profileStartup = args['profile-startup']
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(), 'github', 'atom')
setPortable = args.portable
if args['resource-path']

View File

@@ -14,7 +14,7 @@ module.exports = ({blobStore}) ->
try
path = require 'path'
ipc = require 'ipc'
ipc = require 'ipc-main'
{getWindowLoadSettings} = require './window-load-settings-helpers'
AtomEnvironment = require '../src/atom-environment'
ApplicationDelegate = require '../src/application-delegate'

View File

@@ -1,7 +1,7 @@
path = require 'path'
_ = require 'underscore-plus'
ipc = require 'ipc'
ipc = require 'ipc-main'
CSON = require 'season'
fs = require 'fs-plus'
{Disposable} = require 'event-kit'

View File

@@ -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")

View File

@@ -1,4 +1,4 @@
ipc = require 'ipc'
ipc = require 'ipc-main'
module.exports = ({commandRegistry, commandInstaller, config}) ->
commandRegistry.add 'atom-workspace',

View File

@@ -2,7 +2,7 @@ _ = require 'underscore-plus'
scrollbarStyle = require 'scrollbar-style'
{Range, Point} = require 'text-buffer'
{CompositeDisposable} = require 'event-kit'
ipc = require 'ipc'
ipc = require 'ipc-main'
TextEditorPresenter = require './text-editor-presenter'
GutterContainerComponent = require './gutter-container-component'

View File

@@ -1,4 +1,4 @@
ipc = require 'ipc'
ipc = require 'ipc-main'
path = require 'path'
{Disposable, CompositeDisposable} = require 'event-kit'
Grim = require 'grim'