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

Pass real Error object in error event

Browse source
This commit is contained in:
Cheng Zhao 2015-10-23 14:36:36 +08:00
parent d5c964c68c
commit 95fe4beda8
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/api/atom_api_auto_updater.cc
View file

@ -23,8 +23,15 @@ AutoUpdater::~AutoUpdater() {
auto_updater::AutoUpdater::SetDelegate(NULL); auto_updater::AutoUpdater::SetDelegate(NULL);
} }
void AutoUpdater::OnError(const std::string& error) { void AutoUpdater::OnError(const std::string& message) {
Emit("error", error); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate());
auto error = v8::Exception::Error(mate::StringToV8(isolate(), message));
EmitCustomEvent(
"error",
error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(),
// Message is also emitted to keep compatibility with old code.
message);
} }
void AutoUpdater::OnCheckingForUpdate() { void AutoUpdater::OnCheckingForUpdate() {

3
docs/api/auto-updater.md
View file

@ -110,8 +110,7 @@ The `autoUpdater` object emits the following events:
Returns: Returns:
* `event` Event * `error` Error
* `message` String
Emitted when there is an error while updating. Emitted when there is an error while updating.