github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename atom module to atom_delegate to avoid conflicts with Atom.

Browse Source
This commit is contained in:
Cheng Zhao
2013-05-07 20:33:50 +08:00
parent 1900ad4cb9
commit e6a9add691
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
browser/api/lib/atom.coffee → browser/api/lib/atom_delegate.coffee
View File

4
browser/default_app/main.js
View File

@@ -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');