From 176e17c45d37d9d48c6bca6b16aafce1ec33537e Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Thu, 22 Oct 2015 22:57:33 -0700 Subject: [PATCH] Cleanup lib/fp/fp.js. --- lib/fp/fp.js | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/lib/fp/fp.js b/lib/fp/fp.js index e62e802f8..d440032b8 100644 --- a/lib/fp/fp.js +++ b/lib/fp/fp.js @@ -1,23 +1,28 @@ -var baseConvert = require('./base.js'), - util = require('./util.js'), - lodash = require('lodash'); +var _ = require('lodash'), + base = require('./base.js'), + util = require('./util.js'); /** * Converts `func` of `name` to an auto-curried iteratee-first data-last version. * If `name` is an object, the methods on it will be converted and the object returned. * - * @param {string} name The name of the function to wrap. - * @param {Function} func The function to wrap. + * @param {string} [name] The name of the function to wrap. + * @param {Function} [func] The function to wrap. * @returns {Function|Object} Returns the converted function or object. */ -function convert(name, func) { - if (!func) { +function convert() { + var args = arguments, + name = args[0], + func = args[1], + length = args.length; + + if (length == 1) { func = name; - name = null; + name = undefined; } - return name == null - ? baseConvert(util, _.runInContext()) - : baseConvert(util, name, func); + return length + ? base(util, name, func) + : base(util, _.runInContext()); } module.exports = convert;