merged pull requests 6 and 8 and bumped version

Author: mattinsler

index.js

@@ -129,15 +129,21 @@ var _on = EventEmitter.prototype.on
   , _removeListener = EventEmitter.prototype.removeListener;
 
 EventEmitter.prototype.addListener = function(event, callback) {
-  return _addListener.call(this, event, wrap_callback(callback, 'EventEmitter.addListener'));
+  var args = Array.prototype.slice.call(arguments);
+  args[1] = wrap_callback(callback, 'EventEmitter.addListener');
+  return _addListener.apply(this, args);
 };
 
 EventEmitter.prototype.on = function(event, callback) {
-  return _on.call(this, event, wrap_callback(callback, 'EventEmitter.on'));
+  var args = Array.prototype.slice.call(arguments);
+  args[1] = wrap_callback(callback, 'EventEmitter.on');
+  return _on.apply(this, args);
 };
 
 EventEmitter.prototype.once = function(event, callback) {
-  return _once.call(this, event, wrap_callback(callback, 'EventEmitter.once'));
+  var args = Array.prototype.slice.call(arguments);
+  args[1] = wrap_callback(callback, 'EventEmitter.once');
+  return _once.apply(this, args);
 };
 
 EventEmitter.prototype.removeListener = function(event, callback) {
@@ -173,18 +179,24 @@ EventEmitter.prototype.removeListener = function(event, callback) {
 var _nextTick = process.nextTick;
 
 process.nextTick = function(callback) {
-  return _nextTick.call(this, wrap_callback(callback, 'process.nextTick'));
+  var args = Array.prototype.slice.call(arguments);
+  args[0] = wrap_callback(callback, 'process.nextTick');
+  return _nextTick.apply(this, args);
 };
 
 
 
 var _setTimeout = global.setTimeout
   , _setInterval = global.setInterval;
 
-global.setTimeout = function(callback, interval) {
-  return _setTimeout.call(this, wrap_callback(callback, 'process.nextTick'), interval);
+global.setTimeout = function(callback) {
+  var args = Array.prototype.slice.call(arguments);
+  args[0] = wrap_callback(callback, 'process.nextTick');
+  return _setTimeout.apply(this, args);
 };
 
-global.setInterval = function(callback, interval) {
-  return _setInterval.call(this, wrap_callback(callback, 'process.nextTick'), interval);
+global.setInterval = function(callback) {
+  var args = Array.prototype.slice.call(arguments);
+  args[0] = wrap_callback(callback, 'process.nextTick');
+  return _setInterval.apply(this, args);
 };

package.json

@@ -2,7 +2,7 @@
   "author": "Matt Insler <[email protected]> (www.mattinsler.com)",
   "name": "longjohn",
   "description": "Long stack traces for node.js inspired by https://github.com/tlrobinson/long-stack-traces",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "repository": {
     "type": "git",
     "url": "[email protected]:mattinsler/longjohn.git"

test.js

@@ -76,3 +76,8 @@ emitter.removeListener('foo', foo);
 console.log('Print once');
 emitter.emit('foo');
 // should print foo 1 time
+
+should show { '0': 1, '1': 2, '2': 3 }
+setTimeout(function () {console.log(arguments);}, 1000, 1, 2, 3);
+//should show { '0': 1, '1': 2, '2': 3 }
+setInterval(function () {console.log(arguments);}, 1000, 1, 2, 3);