Finish renaming iteratee to iterable. [closes #170]

Former-commit-id: 0ac6cecaec0a779cb29c21b5fc3caa90c84479eb
This commit is contained in:
John-David Dalton
2013-01-25 20:10:53 -08:00
parent c8517c0ec9
commit af234cbe54
3 changed files with 38 additions and 38 deletions

View File

@@ -1479,10 +1479,10 @@
' return object;',
' }',
' for (var argsIndex = 1, argsLength = arguments.length; argsIndex < argsLength; argsIndex++) {',
' var iteratee = arguments[argsIndex];',
' if (iteratee) {',
' for (var key in iteratee) {',
' object[key] = iteratee[key];',
' var iterable = arguments[argsIndex];',
' if (iterable) {',
' for (var key in iterable) {',
' object[key] = iterable[key];',
' }',
' }',
' }',
@@ -1524,11 +1524,11 @@
' return object;',
' }',
' for (var argsIndex = 1, argsLength = arguments.length; argsIndex < argsLength; argsIndex++) {',
' var iteratee = arguments[argsIndex];',
' if (iteratee) {',
' for (var key in iteratee) {',
' var iterable = arguments[argsIndex];',
' if (iterable) {',
' for (var key in iterable) {',
' if (object[key] == null) {',
' object[key] = iteratee[key];',
' object[key] = iterable[key];',
' }',
' }',
' }',