add io.js v3.x support

This commit is contained in:
Mike Morris
2015-09-08 15:17:49 -04:00
committed by John Firebaugh
parent 627623edbc
commit 3d48147f2f
4 changed files with 5 additions and 4 deletions

View File

@@ -59,7 +59,7 @@ matrix:
apt:
packages: [ 'lib32stdc++6' ]
- os: linux
env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=iojs-v2
env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=iojs-v3
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
@@ -79,7 +79,7 @@ matrix:
- os: osx
osx_image: xcode6.4
compiler: clang
env: FLAVOR=node NODE_VERSION=iojs-v2
env: FLAVOR=node NODE_VERSION=iojs-v3
- os: osx
osx_image: xcode6.4
compiler: clang

View File

@@ -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

View File

@@ -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 };

View File

@@ -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)