Rename 'finish-launching' event to 'ready',
'finish-launching' is more like a OS X message name, and in atom-shell it means initialization has done, so 'ready' seems to be a better name and more easy to remember. The 'will-finish-launching' event just represents the corresponding message on OS X and is the same with 'ready' on other platforms, so we keep its name to indicate that it's only useful for OS X specified code.
This commit is contained in:
parent
d3f33152d0
commit
aedacd39d2
6 changed files with 16 additions and 7 deletions
|
@ -49,7 +49,7 @@ void App::OnWillFinishLaunching() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void App::OnFinishLaunching() {
|
void App::OnFinishLaunching() {
|
||||||
Emit("finish-launching");
|
Emit("ready");
|
||||||
}
|
}
|
||||||
|
|
||||||
// static
|
// static
|
||||||
|
|
|
@ -28,5 +28,8 @@ if process.platform is 'darwin'
|
||||||
setBadge: bindings.dockSetBadgeText
|
setBadge: bindings.dockSetBadgeText
|
||||||
getBadge: bindings.dockGetBadgeText
|
getBadge: bindings.dockGetBadgeText
|
||||||
|
|
||||||
|
# Support old event name.
|
||||||
|
app.once 'ready', -> app.emit 'finish-launching'
|
||||||
|
|
||||||
# Only one App object pemitted.
|
# Only one App object pemitted.
|
||||||
module.exports = app
|
module.exports = app
|
||||||
|
|
|
@ -17,7 +17,7 @@ app.on('open-url', function(event, url) {
|
||||||
dialog.showMessageBox({message: url, buttons: ['OK']});
|
dialog.showMessageBox({message: url, buttons: ['OK']});
|
||||||
});
|
});
|
||||||
|
|
||||||
app.on('finish-launching', function() {
|
app.on('ready', function() {
|
||||||
app.commandLine.appendSwitch('js-flags', '--harmony_collections');
|
app.commandLine.appendSwitch('js-flags', '--harmony_collections');
|
||||||
|
|
||||||
mainWindow = new BrowserWindow({ width: 800, height: 600 });
|
mainWindow = new BrowserWindow({ width: 800, height: 600 });
|
||||||
|
|
|
@ -13,11 +13,17 @@ app.on('window-all-closed', function() {
|
||||||
|
|
||||||
## Event: will-finish-launching
|
## Event: will-finish-launching
|
||||||
|
|
||||||
Setup crash reporter and auto updater here.
|
Emitted when application has done basic startup. On Windows and Linux it is the
|
||||||
|
same with `ready` event, on OS X this event represents the
|
||||||
|
`applicationWillFinishLaunching` message of `NSApplication`, usually you would
|
||||||
|
setup listeners to `open-file` and `open-url` events here, and start the crash
|
||||||
|
reporter and auto updater.
|
||||||
|
|
||||||
## Event: finish-launching
|
Under most cases you should just do everything in `ready` event.
|
||||||
|
|
||||||
Do final startup like creating browser window here.
|
## Event: ready
|
||||||
|
|
||||||
|
Emitted when atom-shell has done everything initializaiton.
|
||||||
|
|
||||||
## Event: window-all-closed
|
## Event: window-all-closed
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ app.on('window-all-closed', function() {
|
||||||
|
|
||||||
// This method will be called when atom-shell has done everything
|
// This method will be called when atom-shell has done everything
|
||||||
// initialization and ready for creating browser windows.
|
// initialization and ready for creating browser windows.
|
||||||
app.on('finish-launching', function() {
|
app.on('ready', function() {
|
||||||
// Create the browser window,
|
// Create the browser window,
|
||||||
mainWindow = new Window({ width: 800, height: 600 });
|
mainWindow = new Window({ width: 800, height: 600 });
|
||||||
// and load the index.html of the app.
|
// and load the index.html of the app.
|
||||||
|
|
|
@ -40,7 +40,7 @@ app.on('window-all-closed', function() {
|
||||||
app.terminate();
|
app.terminate();
|
||||||
});
|
});
|
||||||
|
|
||||||
app.on('finish-launching', function() {
|
app.on('ready', function() {
|
||||||
var template = [
|
var template = [
|
||||||
{
|
{
|
||||||
label: 'Atom',
|
label: 'Atom',
|
||||||
|
|
Loading…
Reference in a new issue