refactor(indexOf) use Array.prototype.indexOf exclusively

realityking · petebacondarwin · commit 300bffc4fe1e · 2014-09-03T13:37:03.000+01:00
Replace helper functions with the native ES5 method Closes angular#8847
diff --git a/src/.jshintrc b/src/.jshintrc
@@ -58,7 +58,6 @@
     "map": false,
     "size": false,
     "includes": false,
-    "indexOf": false,
     "arrayRemove": false,
     "isLeafNode": false,
     "copy": false,
diff --git a/src/Angular.js b/src/Angular.js
@@ -53,7 +53,6 @@
   map: true,
   size: true,
   includes: true,
-  indexOf: true,
   arrayRemove: true,
   isLeafNode: true,
   copy: true,
@@ -651,20 +650,11 @@ function size(obj, ownPropsOnly) {
 
 
 function includes(array, obj) {
-  return indexOf(array, obj) != -1;
-}
-
-function indexOf(array, obj) {
-  if (array.indexOf) return array.indexOf(obj);
-
-  for (var i = 0; i < array.length; i++) {
-    if (obj === array[i]) return i;
-  }
-  return -1;
+  return Array.prototype.indexOf.call(array, obj) != -1;
 }
 
 function arrayRemove(array, value) {
-  var index = indexOf(array, value);
+  var index = array.indexOf(value);
   if (index >=0)
     array.splice(index, 1);
   return value;
@@ -769,7 +759,7 @@ function copy(source, destination, stackSource, stackDest) {
     stackDest = stackDest || [];
 
     if (isObject(source)) {
-      var index = indexOf(stackSource, source);
+      var index = stackSource.indexOf(source);
       if (index !== -1) return stackDest[index];
 
       stackSource.push(source);
diff --git a/src/ng/directive/form.js b/src/ng/directive/form.js
@@ -191,7 +191,7 @@ function FormController(element, attrs, $scope, $animate) {
     var pendingChange, pending = form.$pending && form.$pending[validationToken];
 
     if (pending) {
-      pendingChange = indexOf(pending, control) >= 0;
+      pendingChange = pending.indexOf(control) >= 0;
       if (pendingChange) {
         arrayRemove(pending, control);
         pendingCount--;
diff --git a/src/ng/http.js b/src/ng/http.js
@@ -1008,7 +1008,7 @@ function $HttpProvider() {
 
 
       function removePendingReq() {
-        var idx = indexOf($http.pendingRequests, config);
+        var idx = $http.pendingRequests.indexOf(config);
         if (idx !== -1) $http.pendingRequests.splice(idx, 1);
       }
     }
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
@@ -1094,7 +1094,7 @@ function $RootScopeProvider(){
 
         var self = this;
         return function() {
-          namedListeners[indexOf(namedListeners, listener)] = null;
+          namedListeners[namedListeners.indexOf(listener)] = null;
           decrementListenerCount(self, 1, name);
         };
       },
diff --git a/src/ngScenario/.jshintrc b/src/ngScenario/.jshintrc
@@ -9,7 +9,6 @@
     "browserTrigger": false,
     "console": false,
     "alert": false,
-    "indexOf": false,
     "_jQuery": false,
     "angularInit": false,
     "formatException": false,
diff --git a/src/ngScenario/Scenario.js b/src/ngScenario/Scenario.js
@@ -112,7 +112,7 @@ angular.scenario.setUpAndRun = function(config) {
   }
 
   angular.forEach(angular.scenario.output, function(fn, name) {
-    if (!output.length || indexOf(output,name) != -1) {
+    if (!output.length || output.indexOf(name) != -1) {
       var context = body.append('<div></div>').find('div:last');
       context.attr('id', name);
       fn.call({}, context, $runner, objModel);
diff --git a/src/ngScenario/browserTrigger.js b/src/ngScenario/browserTrigger.js
@@ -3,17 +3,6 @@
 (function() {
   var msie = parseInt((/msie (\d+)/.exec(navigator.userAgent.toLowerCase()) || [])[1], 10);
 
-  function indexOf(array, obj) {
-    if (array.indexOf) return array.indexOf(obj);
-
-    for ( var i = 0; i < array.length; i++) {
-      if (obj === array[i]) return i;
-    }
-    return -1;
-  }
-
-
-
   /**
    * Triggers a browser event. Attempts to choose the right event if one is
    * not specified.
@@ -60,7 +49,7 @@
 
     keys = keys || [];
     function pressed(key) {
-      return indexOf(keys, key) !== -1;
+      return keys.indexOf(key) !== -1;
     }
 
     if (msie < 9) {
diff --git a/test/.jshintrc b/test/.jshintrc
@@ -56,7 +56,6 @@
     "map": false,
     "size": false,
     "includes": false,
-    "indexOf": false,
     "arrayRemove": false,
     "isLeafNode": false,
     "copy": false,
diff --git a/test/helpers/matchers.js b/test/helpers/matchers.js
@@ -167,7 +167,7 @@ beforeEach(function() {
 
 
     toBeOneOf: function() {
-      return indexOf(arguments, this.actual) !== -1;
+      return Array.prototype.indexOf.call(arguments, this.actual) !== -1;
     },
 
     toHaveClass: function(clazz) {
diff --git a/test/helpers/testabilityPatch.js b/test/helpers/testabilityPatch.js
@@ -222,7 +222,7 @@ function sortedHtml(element, showNgClass) {
           var value = node.style[css];
           if (isString(value) && isString(css) && css != 'cssText' && value && (1*css != css)) {
             var text = lowercase(css + ': ' + value);
-            if (value != 'false' && indexOf(style, text) == -1) {
+            if (value != 'false' && style.indexOf(text) == -1) {
               style.push(text);
             }
           }
diff --git a/test/ng/httpBackendSpec.js b/test/ng/httpBackendSpec.js
@@ -25,7 +25,7 @@ describe('$httpBackend', function() {
     while (len--) fakeTimeout.fns.shift()();
   };
   fakeTimeout.cancel = function(id) {
-    var i = indexOf(fakeTimeout.ids, id);
+    var i = fakeTimeout.ids.indexOf(id);
     if (i >= 0) {
       fakeTimeout.fns.splice(i, 1);
       fakeTimeout.delays.splice(i, 1);
@@ -50,7 +50,7 @@ describe('$httpBackend', function() {
           fakeDocument.$$scripts.push(script);
         }),
         removeChild: jasmine.createSpy('body.removeChild').andCallFake(function(script) {
-          var index = indexOf(fakeDocument.$$scripts, script);
+          var index = fakeDocument.$$scripts.indexOf(script);
           if (index != -1) {
             fakeDocument.$$scripts.splice(index, 1);
           }

Original file line number	Diff line number	Diff line change
`@@ -1008,7 +1008,7 @@ function $HttpProvider() {`
`1008`	`1008`
`1009`	`1009`
`1010`	`1010`	`function removePendingReq() {`
`1011`		`- var idx = indexOf($http.pendingRequests, config);`
	`1011`	`+ var idx = $http.pendingRequests.indexOf(config);`
`1012`	`1012`	`if (idx !== -1) $http.pendingRequests.splice(idx, 1);`
`1013`	`1013`	`}`
`1014`	`1014`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ angular.scenario.setUpAndRun = function(config) {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`angular.forEach(angular.scenario.output, function(fn, name) {`
`115`		`- if (!output.length \|\| indexOf(output,name) != -1) {`
	`115`	`+ if (!output.length \|\| output.indexOf(name) != -1) {`
`116`	`116`	`var context = body.append('<div></div>').find('div:last');`
`117`	`117`	`context.attr('id', name);`
`118`	`118`	`fn.call({}, context, $runner, objModel);`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ function sortedHtml(element, showNgClass) {`
`222`	`222`	`var value = node.style[css];`
`223`	`223`	`if (isString(value) && isString(css) && css != 'cssText' && value && (1*css != css)) {`
`224`	`224`	`var text = lowercase(css + ': ' + value);`
`225`		`- if (value != 'false' && indexOf(style, text) == -1) {`
	`225`	`+ if (value != 'false' && style.indexOf(text) == -1) {`
`226`	`226`	`style.push(text);`
`227`	`227`	`}`
`228`	`228`	`}`