Some fixes to Task-inheritance.

mpareja · Feb 6, 2012 · b41d35a · b41d35a
1 parent 30ce6a7
commit b41d35a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/lib/task/directory_task.js b/lib/task/directory_task.js
@@ -3,7 +3,11 @@ var DirectoryTask
 
 DirectoryTask = function (name, prereqs, action, opts) {
   this.modTime = null;
-  this.constructor.prototype.initialize.apply(this, arguments);
+  // Do constructor-work only on actual instances, not when used
+  // for inheritance
+  if (arguments.length) {
+    this.constructor.prototype.init.apply(this, arguments);
+  }
 };
 DirectoryTask.prototype = new FileTask();
 DirectoryTask.prototype.constructor = DirectoryTask;

diff --git a/lib/task/file_task.js b/lib/task/file_task.js
@@ -92,7 +92,11 @@ FileBase = new (function () {
 
 FileTask = function (name, prereqs, action, opts) {
   this.modTime = null;
-  this.constructor.prototype.initialize.apply(this, arguments);
+  // Do constructor-work only on actual instances, not when used
+  // for inheritance
+  if (arguments.length) {
+    this.constructor.prototype.init.apply(this, arguments);
+  }
 };
 FileTask.prototype = new Task();
 FileTask.prototype.constructor = FileTask;

diff --git a/lib/task/task.js b/lib/task/task.js
@@ -10,7 +10,11 @@ var fs = require('fs')
  * A Jake task
  */
 Task = function () {
-  this.constructor.prototype.initialize.apply(this, arguments);
+  // Do constructor-work only on actual instances, not when used
+  // for inheritance
+  if (arguments.length) {
+    this.constructor.prototype.init.apply(this, arguments);
+  }
 };
 
 Task.prototype = new EventEmitter();
@@ -32,7 +36,7 @@ TaskBase = new (function () {
         };
       };
 
-  this.initialize = function (name, prereqs, action, options) {
+  this.init = function (name, prereqs, action, options) {
     var opts = options || {};
 
     this._currentPrereqIndex = 0;