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

fix: [wc|bw]-created events do not emit an event object (#19465)

Browse source 
* fix: emit real Event instead of empty object in [wc|bw]

* chore: add ability to emit empty events
This commit is contained in:
Shelley Vohr 2019-07-29 13:54:37 -07:00 committed by GitHub
parent 33d1e87163
commit aaca9011ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/browser/api/browser-window.js
View file

@ -82,7 +82,8 @@ BrowserWindow.prototype._init = function () {
} }
// Notify the creation of the window. // Notify the creation of the window.
app.emit('browser-window-created', {}, this) const event = process.electronBinding('event').createEmpty()
app.emit('browser-window-created', event, this)
Object.defineProperty(this, 'devToolsWebContents', { Object.defineProperty(this, 'devToolsWebContents', {
enumerable: true, enumerable: true,

3
lib/browser/api/web-contents.js
View file

@ -413,7 +413,8 @@ WebContents.prototype._init = function () {
}) })
} }
app.emit('web-contents-created', {}, this) const event = process.electronBinding('event').createEmpty()
app.emit('web-contents-created', event, this)
} }
// Deprecations // Deprecations

5
shell/browser/api/atom_api_event.cc
View file

@ -13,12 +13,17 @@ v8::Local<v8::Object> CreateWithSender(v8::Isolate* isolate,
return mate::internal::CreateJSEvent(isolate, sender, nullptr, base::nullopt); return mate::internal::CreateJSEvent(isolate, sender, nullptr, base::nullopt);
} }
v8::Local<v8::Object> CreateEmpty(v8::Isolate* isolate) {
return mate::internal::CreateEmptyJSEvent(isolate);
}
void Initialize(v8::Local<v8::Object> exports, void Initialize(v8::Local<v8::Object> exports,
v8::Local<v8::Value> unused, v8::Local<v8::Value> unused,
v8::Local<v8::Context> context, v8::Local<v8::Context> context,
void* priv) { void* priv) {
mate::Dictionary dict(context->GetIsolate(), exports); mate::Dictionary dict(context->GetIsolate(), exports);
dict.SetMethod("createWithSender", &CreateWithSender); dict.SetMethod("createWithSender", &CreateWithSender);
dict.SetMethod("createEmpty", &CreateEmpty);
} }
} // namespace } // namespace

7
shell/browser/api/event_emitter.cc
View file

@ -67,6 +67,13 @@ v8::Local<v8::Object> CreateJSEvent(
return event; return event;
} }
v8::Local<v8::Object> CreateEmptyJSEvent(v8::Isolate* isolate) {
mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
v8::Local<v8::Object> event =
v8::Local<v8::Object>::Cast(native_event.ToV8());
return event;
}
v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate, v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
v8::Local<v8::Object> object, v8::Local<v8::Object> object,
v8::Local<v8::Object> custom_event) { v8::Local<v8::Object> custom_event) {

1
shell/browser/api/event_emitter.h
View file

@ -28,6 +28,7 @@ v8::Local<v8::Object> CreateJSEvent(
content::RenderFrameHost* sender, content::RenderFrameHost* sender,
base::Optional<electron::mojom::ElectronBrowser::MessageSyncCallback> base::Optional<electron::mojom::ElectronBrowser::MessageSyncCallback>
callback); callback);
v8::Local<v8::Object> CreateEmptyJSEvent(v8::Isolate* isolate);
v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate, v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
v8::Local<v8::Object> object, v8::Local<v8::Object> object,
v8::Local<v8::Object> event); v8::Local<v8::Object> event);