Fixed callbacks to be null unless set in structs

John Haley · John Haley · commit bc77038f7aaf · 2015-02-05T11:18:45.000-07:00
diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc
@@ -43,6 +43,10 @@
 
       {% elsif field.isCallbackFunction %}
         if (value->IsFunction()) {
+          if (!wrapper->raw->{{ field.name }}) {
+            wrapper->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;
+          }
+
           wrapper->{{ field.name }} = new NanCallback(value.As<Function>());
         }
 
diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc
@@ -63,7 +63,7 @@ void {{ cppClassName }}::ConstructFields() {
 
           // Set the static method call and set the payload for this function to be
           // the current instance
-          this->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;
+          this->raw->{{ field.name }} = NULL;
           this->raw->{{ fields|payloadFor field.name }} = (void *)this;
           this->{{ field.name }} = new NanCallback();
         {% elsif field.payloadFor %}
diff --git a/test/tests/diff.js b/test/tests/diff.js
@@ -85,7 +85,7 @@ describe("Diff", function() {
     assert.equal(lines[4].contentLen(), 162);
   });
 
-  it.only("can diff the workdir with index", function() {
+  it("can diff the workdir with index", function() {
     var patches = this.workdirDiff.patches();
     assert.equal(patches.length, 1);
     assert(patches[0].isUntracked());

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@`
`43`	`43`
`44`	`44`	`{% elsif field.isCallbackFunction %}`
`45`	`45`	`if (value->IsFunction()) {`
	`46`	`+ if (!wrapper->raw->{{ field.name }}) {`
	`47`	`+ wrapper->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;`
	`48`	`+ }`
	`49`	`+`
`46`	`50`	`wrapper->{{ field.name }} = new NanCallback(value.As<Function>());`
`47`	`51`	`}`
`48`	`52`