diff --git a/src/.jshintrc b/src/.jshintrc index 5eda6c46..b8e18287 100644 --- a/src/.jshintrc +++ b/src/.jshintrc @@ -55,7 +55,6 @@ "trim": false, "isElement": false, "makeMap": false, - "map": false, "size": false, "includes": false, "arrayRemove": false, diff --git a/src/Angular.js b/src/Angular.js index 276586dc..aa549c68 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -50,7 +50,6 @@ trim: true, isElement: true, makeMap: true, - map: true, size: true, includes: true, arrayRemove: true, @@ -617,15 +616,6 @@ function nodeName_(element) { } -function map(obj, iterator, context) { - var results = []; - forEach(obj, function(value, index, list) { - results.push(iterator.call(context, value, index, list)); - }); - return results; -} - - /** * @description * Determines the number of elements in an array, the number of properties an object has, or diff --git a/src/ng/filter/orderBy.js b/src/ng/filter/orderBy.js index cc8d825f..c68ce2ba 100644 --- a/src/ng/filter/orderBy.js +++ b/src/ng/filter/orderBy.js @@ -118,7 +118,7 @@ function orderByFilter($parse){ if (!(isArrayLike(array))) return array; if (!sortPredicate) return array; sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate]; - sortPredicate = map(sortPredicate, function(predicate){ + sortPredicate = sortPredicate.map(function(predicate){ var descending = false, get = predicate || identity; if (isString(predicate)) { if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) { diff --git a/test/helpers/testabilityPatch.js b/test/helpers/testabilityPatch.js index 47d1742b..d96bd2db 100644 --- a/test/helpers/testabilityPatch.js +++ b/test/helpers/testabilityPatch.js @@ -335,7 +335,7 @@ var karmaDump = window.dump || function() { }; window.dump = function () { - karmaDump.apply(undefined, map(arguments, function(arg) { + karmaDump.apply(undefined, Array.prototype.map.call(arguments, function(arg) { return angular.mock.dump(arg); })); }; diff --git a/test/ng/parseSpec.js b/test/ng/parseSpec.js index b77a76b7..cc36b35a 100644 --- a/test/ng/parseSpec.js +++ b/test/ng/parseSpec.js @@ -147,12 +147,12 @@ describe('parser', function() { it('should tokenize function invocation', function() { var tokens = lex("a()"); - expect(map(tokens, function(t) { return t.text;})).toEqual(['a', '(', ')']); + expect(tokens.map(function(t) { return t.text;})).toEqual(['a', '(', ')']); }); it('should tokenize method invocation', function() { var tokens = lex("a.b.c (d) - e.f()"); - expect(map(tokens, function(t) { return t.text;})). + expect(tokens.map(function(t) { return t.text;})). toEqual(['a.b', '.', 'c', '(', 'd', ')', '-', 'e', '.', 'f', '(', ')']); }); diff --git a/test/ng/qSpec.js b/test/ng/qSpec.js index 801a5278..b4b17295 100644 --- a/test/ng/qSpec.js +++ b/test/ng/qSpec.js @@ -41,7 +41,7 @@ describe('q', function() { } function _argumentsToString(args) { - return map(sliceArgs(args), _argToString).join(','); + return sliceArgs(args).map(_argToString).join(','); } // Help log invocation of success(), finally(), progress() and error()