use initialParams to simplify callback extraction

1 files changed, 6 insertions, 13 deletions

diff --git a/lib/timeout.js b/lib/timeout.js
index c8c9dfd..6af4f52 100644
--- a/lib/timeout.js
+++ b/lib/timeout.js
@@ -1,5 +1,7 @@
 'use strict';
 
+import initialParams from './internal/initialParams';
+
 export default function timeout(asyncFn, miliseconds) {
     var originalCallback, timer;
     var timedOut = false;
@@ -18,19 +20,10 @@ export default function timeout(asyncFn, miliseconds) {
         originalCallback(error);
     }
 
-    function injectCallback(asyncFnArgs) {
-        // replace callback in asyncFn args
-        var args = Array.prototype.slice.call(asyncFnArgs, 0);
-        originalCallback = args[args.length - 1];
-        args[args.length - 1] = injectedCallback;
-        return args;
-    }
-
-    function wrappedFn() {
+    return initialParams(function (args, origCallback) {
+        originalCallback = origCallback;
         // setup timer and call original function
         timer = setTimeout(timeoutCallback, miliseconds);
-        asyncFn.apply(null, injectCallback(arguments));
-    }
-
-    return wrappedFn;
+        asyncFn.apply(null, args.concat(injectedCallback));
+    });
 }