revert: fix(form): ignore properties in $error prototype chain

jeffbcross · jeffbcross · commit ef6fed3ef878 · 2015-01-26T14:20:52.000-08:00
This reverts commit adf91fe.
diff --git a/src/Angular.js b/src/Angular.js
@@ -263,7 +263,7 @@ function forEach(obj, iterator, context) {
         obj.forEach(iterator, context, obj);
     } else {
       for (key in obj) {
-        if (hasOwnProperty.call(obj, key)) {
+        if (obj.hasOwnProperty(key)) {
           iterator.call(context, obj[key], key, obj);
         }
       }
diff --git a/src/ng/directive/form.js b/src/ng/directive/form.js
@@ -67,8 +67,8 @@ function FormController(element, attrs, $scope, $animate, $interpolate) {
   var parentForm = form.$$parentForm = element.parent().controller('form') || nullFormCtrl;
 
   // init state
-  form.$error = createMap();
-  form.$$success = createMap();
+  form.$error = {};
+  form.$$success = {};
   form.$pending = undefined;
   form.$name = $interpolate(attrs.name || attrs.ngForm || '')($scope);
   form.$dirty = false;
diff --git a/src/ng/directive/ngModel.js b/src/ng/directive/ngModel.js
@@ -233,8 +233,8 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
   this.$dirty = false;
   this.$valid = true;
   this.$invalid = false;
-  this.$error = createMap(); // keep invalid keys here
-  this.$$success = createMap(); // keep valid keys here
+  this.$error = {}; // keep invalid keys here
+  this.$$success = {}; // keep valid keys here
   this.$pending = undefined; // keep pending keys here
   this.$name = $interpolate($attr.name || '', false)($scope);
 
diff --git a/test/ng/directive/ngModelSpec.js b/test/ng/directive/ngModelSpec.js
@@ -54,22 +54,6 @@ describe('ngModel', function() {
     });
 
 
-    it('should ignore items in prototype chain when determining validity', inject(function($compile) {
-      dealoc(element);
-      Object.prototype.someProp = true;
-      element = $compile('<form name="form"><input type="text" ng-model="value" name="value"></form>')(scope);
-      var input = element.children().eq(0);
-      ctrl = input.controller('ngModel');
-      var form = element.controller('form');
-      scope.$digest();
-      expect(ctrl.$valid).toBe(true);
-      expect(element.children()).toBeValid();
-      expect(form.$valid).toBe(true);
-      expect(element).toBeValid();
-      delete Object.prototype.someProp;
-    }));
-
-
     describe('setValidity', function() {
 
       function expectOneError() {

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ function forEach(obj, iterator, context) {`
`263`	`263`	`obj.forEach(iterator, context, obj);`
`264`	`264`	`} else {`
`265`	`265`	`for (key in obj) {`
`266`		`- if (hasOwnProperty.call(obj, key)) {`
	`266`	`+ if (obj.hasOwnProperty(key)) {`
`267`	`267`	`iterator.call(context, obj[key], key, obj);`
`268`	`268`	`}`
`269`	`269`	`}`