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

Add spec for destroying synchronous event.

Browse Source
This commit is contained in:
Cheng Zhao
2013-09-26 11:27:09 +08:00
parent 65176761f4
commit 5480cf58c2
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
browser/api/atom_api_event.cc
View File

@@ -23,7 +23,7 @@ Event::Event()
}
Event::~Event() {
if (sender_)
if (sender_ != NULL)
sender_->RemoveObserver(this);
}
@@ -40,6 +40,7 @@ v8::Handle<v8::Object> Event::CreateV8Object() {
NODE_SET_PROTOTYPE_METHOD(t, "preventDefault", PreventDefault);
NODE_SET_PROTOTYPE_METHOD(t, "sendReply", SendReply);
NODE_SET_PROTOTYPE_METHOD(t, "destroy", Destroy);
}
v8::Handle<v8::Object> v8_event =
@@ -87,8 +88,8 @@ v8::Handle<v8::Value> Event::SendReply(const v8::Arguments& args) {
if (event == NULL)
return node::ThrowError("Event is already destroyed");
if (event->message_ == NULL)
return node::ThrowError("Can only send reply to synchronous events once");
if (event->message_ == NULL || event->sender_ == NULL)
return node::ThrowError("Can only send reply to synchronous events");
string16 json = FromV8Value(args[0]);
@@ -99,6 +100,12 @@ v8::Handle<v8::Value> Event::SendReply(const v8::Arguments& args) {
return v8::Undefined();
}
// static
v8::Handle<v8::Value> Event::Destroy(const v8::Arguments& args) {
delete Unwrap<Event>(args.This());
return v8::Undefined();
}
} // namespace api
} // namespace atom

1
browser/api/atom_api_event.h
View File

@@ -49,6 +49,7 @@ class Event : public node::ObjectWrap,
static v8::Handle<v8::Value> PreventDefault(const v8::Arguments& args);
static v8::Handle<v8::Value> SendReply(const v8::Arguments& args);
static v8::Handle<v8::Value> Destroy(const v8::Arguments& args);
static v8::Persistent<v8::FunctionTemplate> constructor_template_;