mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Clean the init.coffee

Browse source
This commit is contained in:
Cheng Zhao 2015-01-21 17:38:26 -08:00
parent 7210f6e64d
commit 4ba3e101f6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/lib/init.coffee
View file

@ -24,7 +24,7 @@ globalPaths = module.globalPaths
globalPaths.push path.join process.resourcesPath, 'atom', 'browser', 'api', 'lib' globalPaths.push path.join process.resourcesPath, 'atom', 'browser', 'api', 'lib'
# Import common settings. # Import common settings.
require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init.js') require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
if process.platform is 'win32' if process.platform is 'win32'
# Redirect node's console to use our own implementations, since node can not # Redirect node's console to use our own implementations, since node can not
@ -52,7 +52,8 @@ process.on 'uncaughtException', (error) ->
require('dialog').showErrorBox 'A JavaScript error occured in the browser process', message require('dialog').showErrorBox 'A JavaScript error occured in the browser process', message
# Emit 'exit' event on quit. # Emit 'exit' event on quit.
require('app').on 'quit', -> app = require 'app'
app.on 'quit', ->
process.emit 'exit' process.emit 'exit'
# Load the RPC server. # Load the RPC server.
@ -77,7 +78,6 @@ for packagePath in searchPaths
throw new Error("Unable to find a valid app") unless packageJson? throw new Error("Unable to find a valid app") unless packageJson?
# Set application's version. # Set application's version.
app = require 'app'
app.setVersion packageJson.version if packageJson.version? app.setVersion packageJson.version if packageJson.version?
# Set application's name. # Set application's name.
@ -90,14 +90,14 @@ else if packageJson.name?
if packageJson.desktopName? if packageJson.desktopName?
app.setDesktopName packageJson.desktopName app.setDesktopName packageJson.desktopName
else else
app.setDesktopName '#{app.getName()}.desktop' app.setDesktopName "#{app.getName()}.desktop"
# Set the user path according to application's name. # Set the user path according to application's name.
app.setPath 'userData', path.join(app.getPath('appData'), app.getName()) app.setPath 'userData', path.join(app.getPath('appData'), app.getName())
app.setPath 'userCache', path.join(app.getPath('cache'), app.getName()) app.setPath 'userCache', path.join(app.getPath('cache'), app.getName())
# Load the chrome extension support. # Load the chrome extension support.
require './chrome-extension.js' require './chrome-extension'
# Finally load app's main.js and transfer control to C++. # Finally load app's main.js and transfer control to C++.
module._load path.join(packagePath, packageJson.main), module, true module._load path.join(packagePath, packageJson.main), module, true

2
atom/renderer/lib/init.coffee
View file

@ -19,7 +19,7 @@ globalPaths.push path.join(process.resourcesPath, 'atom', 'renderer', 'api', 'li
globalPaths.push path.join(process.resourcesPath, 'app') globalPaths.push path.join(process.resourcesPath, 'app')
# Import common settings. # Import common settings.
require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init.js') require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
# Process command line arguments. # Process command line arguments.
nodeIntegration = 'false' nodeIntegration = 'false'