mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
Rename atom module to atom_delegate to avoid conflicts with Atom.
This commit is contained in:
2
atom.gyp
2
atom.gyp
@@ -7,7 +7,7 @@
|
||||
],
|
||||
'coffee_sources': [
|
||||
'browser/api/lib/app.coffee',
|
||||
'browser/api/lib/atom.coffee',
|
||||
'browser/api/lib/atom_delegate.coffee',
|
||||
'browser/api/lib/dialog.coffee',
|
||||
'browser/api/lib/ipc.coffee',
|
||||
'browser/api/lib/window.coffee',
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
var app = require('app');
|
||||
var atom = require('atom');
|
||||
var delegate = require('atom_delegate');
|
||||
var ipc = require('ipc');
|
||||
var Window = require('window');
|
||||
|
||||
@@ -19,7 +19,7 @@ ipc.on('sync-message', function(event, process_id, routing_id) {
|
||||
event.result = arguments;
|
||||
});
|
||||
|
||||
atom.browserMainParts.preMainMessageLoopRun = function() {
|
||||
delegate.browserMainParts.preMainMessageLoopRun = function() {
|
||||
mainWindow = new Window({ width: 800, height: 600 });
|
||||
mainWindow.loadUrl('file://' + __dirname + '/index.html');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user