diff options
author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-09-08 15:17:49 -0400 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-09-09 14:57:26 -0700 |
commit | 3d48147f2f8d2ef3ed3a9b8848ba0304d27c3403 (patch) | |
tree | 920774182b8d68d67a92f2c9053e331942381c8f /platform | |
parent | 627623edbcc0fa8812bfc345b3e338eff229626b (diff) | |
download | qtlocation-mapboxgl-3d48147f2f8d2ef3ed3a9b8848ba0304d27c3403.tar.gz |
add io.js v3.x support
Diffstat (limited to 'platform')
-rw-r--r-- | platform/node/CHANGELOG.md | 1 | ||||
-rw-r--r-- | platform/node/src/node_file_source.cpp | 2 | ||||
-rw-r--r-- | platform/node/src/node_mapbox_gl_native.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md index 6d6486bd29..927cc5ece4 100644 --- a/platform/node/CHANGELOG.md +++ b/platform/node/CHANGELOG.md @@ -9,6 +9,7 @@ render options. - Adds support for rendering v8 styles. - No longer load resources before a render request is made. +- Adds io.js v3.x support. # 1.1.3 diff --git a/platform/node/src/node_file_source.cpp b/platform/node/src/node_file_source.cpp index 29a4748c53..622584846c 100644 --- a/platform/node/src/node_file_source.cpp +++ b/platform/node/src/node_file_source.cpp @@ -75,7 +75,7 @@ void NodeFileSource::processAdd(const mbgl::Resource& resource) { queue->ref(); } - auto requestHandle = Nan::New<v8::Object>(NodeRequest::Create(this, resource)); + v8::Local<v8::Object> requestHandle = NodeRequest::Create(this, resource)->ToObject(); pending.emplace(resource, requestHandle); v8::Local<v8::Value> argv[] = { requestHandle }; diff --git a/platform/node/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp index b631b32c54..c0fb47d144 100644 --- a/platform/node/src/node_mapbox_gl_native.cpp +++ b/platform/node/src/node_mapbox_gl_native.cpp @@ -59,7 +59,7 @@ NAN_MODULE_INIT(RegisterModule) { Nan::SetPrototype(target, Nan::Get(EventEmitter, Nan::New("prototype").ToLocalChecked()).ToLocalChecked()); - mbgl::Log::setObserver(std::make_unique<node_mbgl::NodeLogObserver>(Nan::New(target))); + mbgl::Log::setObserver(std::make_unique<node_mbgl::NodeLogObserver>(target->ToObject())); } NODE_MODULE(mapbox_gl_native, RegisterModule) |