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

Rename 'window' module to 'browser_window' module. Fix #3.

Browse source
This commit is contained in:
Cheng Zhao 2013-05-15 19:19:35 +08:00
parent f477ec09c0
commit 072ac8ba0b
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
browser/api/atom_api_window.cc
View file

@ -586,7 +586,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(Window::New);
t->InstanceTemplate()->SetInternalFieldCount(1);
t->SetClassName(v8::String::NewSymbol("Window"));
t->SetClassName(v8::String::NewSymbol("BrowserWindow"));
NODE_SET_PROTOTYPE_METHOD(t, "destroy", Destroy);
NODE_SET_PROTOTYPE_METHOD(t, "close", Close);
@ -639,7 +639,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "reload", Reload);
NODE_SET_PROTOTYPE_METHOD(t, "reloadIgnoringCache", ReloadIgnoringCache);
target->Set(v8::String::NewSymbol("Window"), t->GetFunction());
target->Set(v8::String::NewSymbol("BrowserWindow"), t->GetFunction());
}
} // namespace api

6
browser/api/lib/browser_window.coffee Normal file
View file

@ -0,0 +1,6 @@
EventEmitter = require('events').EventEmitter
BrowserWindow = process.atomBinding('window').BrowserWindow
BrowserWindow.prototype.__proto__ = EventEmitter.prototype
module.exports = BrowserWindow

4
browser/api/lib/dialog.coffee
View file

@ -1,8 +1,8 @@
binding = process.atomBinding 'dialog'
BrowserWindow = require 'browser_window'
CallbacksRegistry = require 'callbacks_registry'
EventEmitter = require('events').EventEmitter
ipc = require 'ipc'
Window = require 'window'
FileDialog = binding.FileDialog
FileDialog.prototype.__proto__ = EventEmitter.prototype
@ -34,7 +34,7 @@ validateOptions = (options) ->
true
selectFileWrap = (window, options, callback, type, title) ->
throw new TypeError('Need Window object') unless window.constructor is Window
throw new TypeError('Need BrowserWindow object') unless window.constructor is BrowserWindow
options = {} unless options?
options.type = type

4
browser/api/lib/menu.coffee
View file

@ -1,12 +1,12 @@
EventEmitter = require('events').EventEmitter
Window = require 'window'
BrowserWindow = require 'browser_window'
Menu = process.atomBinding('menu').Menu
Menu::__proto__ = EventEmitter.prototype
popup = Menu::popup
Menu::popup = (window) ->
throw new TypeError('Invalid window') unless window?.constructor is Window
throw new TypeError('Invalid window') unless window?.constructor is BrowserWindow
popup.call this, window

6
browser/api/lib/window.coffee
View file

@ -1,6 +0,0 @@
EventEmitter = require('events').EventEmitter
Window = process.atomBinding('window').Window
Window.prototype.__proto__ = EventEmitter.prototype
module.exports = Window