Commit fa595ff8 by Adeel

Code: Renames callback <-> success_callback.

parent 3a9c84bc
...@@ -74,7 +74,7 @@ void ExtractOptions(Local<Object> options, void* cptr, sass_context_wrapper* ctx ...@@ -74,7 +74,7 @@ void ExtractOptions(Local<Object> options, void* cptr, sass_context_wrapper* ctx
NanAssignPersistent(ctx_w->stats, options->Get(NanNew("stats"))->ToObject()); NanAssignPersistent(ctx_w->stats, options->Get(NanNew("stats"))->ToObject());
// async (callback) style // async (callback) style
Local<Function> callback = Local<Function>::Cast(options->Get(NanNew("success"))); Local<Function> success_callback = Local<Function>::Cast(options->Get(NanNew("success")));
Local<Function> error_callback = Local<Function>::Cast(options->Get(NanNew("error"))); Local<Function> error_callback = Local<Function>::Cast(options->Get(NanNew("error")));
Local<Function> importer_callback = Local<Function>::Cast(options->Get(NanNew("importer"))); Local<Function> importer_callback = Local<Function>::Cast(options->Get(NanNew("importer")));
...@@ -84,7 +84,7 @@ void ExtractOptions(Local<Object> options, void* cptr, sass_context_wrapper* ctx ...@@ -84,7 +84,7 @@ void ExtractOptions(Local<Object> options, void* cptr, sass_context_wrapper* ctx
ctx_w->dctx = (struct Sass_Data_Context*) cptr; ctx_w->dctx = (struct Sass_Data_Context*) cptr;
} }
ctx_w->request.data = ctx_w; ctx_w->request.data = ctx_w;
ctx_w->callback = new NanCallback(callback); ctx_w->success_callback = new NanCallback(success_callback);
ctx_w->error_callback = new NanCallback(error_callback); ctx_w->error_callback = new NanCallback(error_callback);
ctx_w->importer_callback = new NanCallback(importer_callback); ctx_w->importer_callback = new NanCallback(importer_callback);
...@@ -157,7 +157,7 @@ void MakeCallback(uv_work_t* req) { ...@@ -157,7 +157,7 @@ void MakeCallback(uv_work_t* req) {
NanNew<String>(val), NanNew<String>(val),
NanNew(ctx_w->stats)->Get(NanNew("sourceMap")) NanNew(ctx_w->stats)->Get(NanNew("sourceMap"))
}; };
ctx_w->callback->Call(2, argv); ctx_w->success_callback->Call(2, argv);
} else { } else {
// if error, do callback(error) // if error, do callback(error)
const char* err = sass_context_get_error_json(ctx); const char* err = sass_context_get_error_json(ctx);
......
...@@ -33,7 +33,7 @@ extern "C" { ...@@ -33,7 +33,7 @@ extern "C" {
} }
NanDisposePersistent(ctx_w->stats); NanDisposePersistent(ctx_w->stats);
delete ctx_w->callback; delete ctx_w->success_callback;
delete ctx_w->error_callback; delete ctx_w->error_callback;
delete ctx_w->importer_callback; delete ctx_w->importer_callback;
......
...@@ -16,7 +16,7 @@ struct sass_context_wrapper { ...@@ -16,7 +16,7 @@ struct sass_context_wrapper {
Sass_File_Context* fctx; Sass_File_Context* fctx;
Persistent<Object> stats; Persistent<Object> stats;
uv_work_t request; uv_work_t request;
NanCallback* callback; NanCallback* success_callback;
NanCallback* error_callback; NanCallback* error_callback;
NanCallback* importer_callback; NanCallback* importer_callback;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment