Skip to content

Commit f938de1

Browse files
committed
Default this to undefined for function calls
Ref: nodejs/abi-stable-node#227 (comment)
1 parent a574f7a commit f938de1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

napi-inl.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -994,15 +994,15 @@ inline Function::Function(napi_env env, napi_value value) : Object(env, value) {
994994
}
995995

996996
inline Value Function::operator ()(const std::initializer_list<napi_value>& args) const {
997-
return Call(Env().Global(), args);
997+
return Call(Env().Undefined(), args);
998998
}
999999

10001000
inline Value Function::Call(const std::initializer_list<napi_value>& args) const {
1001-
return Call(Env().Global(), args);
1001+
return Call(Env().Undefined(), args);
10021002
}
10031003

10041004
inline Value Function::Call(const std::vector<napi_value>& args) const {
1005-
return Call(Env().Global(), args);
1005+
return Call(Env().Undefined(), args);
10061006
}
10071007

10081008
inline Value Function::Call(napi_value recv, const std::initializer_list<napi_value>& args) const {
@@ -1022,11 +1022,11 @@ inline Value Function::Call(napi_value recv, const std::vector<napi_value>& args
10221022
}
10231023

10241024
inline Value Function::MakeCallback(const std::initializer_list<napi_value>& args) const {
1025-
return MakeCallback(Env().Global(), args);
1025+
return MakeCallback(Env().Undefined(), args);
10261026
}
10271027

10281028
inline Value Function::MakeCallback(const std::vector<napi_value>& args) const {
1029-
return MakeCallback(Env().Global(), args);
1029+
return MakeCallback(Env().Undefined(), args);
10301030
}
10311031

10321032
inline Value Function::MakeCallback(
@@ -1684,7 +1684,7 @@ inline const Value CallbackInfo::operator [](size_t index) const {
16841684

16851685
inline Object CallbackInfo::This() const {
16861686
if (_this == nullptr) {
1687-
return Env().Global();
1687+
return Env().Undefined();
16881688
}
16891689
return Object(_env, _this);
16901690
}
@@ -2165,11 +2165,11 @@ inline ObjectReference& AsyncWorker::Persistent() {
21652165
}
21662166

21672167
inline void AsyncWorker::OnOK() {
2168-
_callback.MakeCallback(Env().Global(), std::vector<napi_value>());
2168+
_callback.MakeCallback(Env().Undefined(), std::vector<napi_value>());
21692169
}
21702170

21712171
inline void AsyncWorker::OnError(Error e) {
2172-
_callback.MakeCallback(Env().Global(), std::vector<napi_value>({ e }));
2172+
_callback.MakeCallback(Env().Undefined(), std::vector<napi_value>({ e }));
21732173
}
21742174

21752175
inline void AsyncWorker::SetError(Error error) {

0 commit comments

Comments
 (0)