fixup! perf(input): prevent multiple validations on compilation

Author: Narretz

src/ng/directive/validators.js

@@ -181,14 +181,10 @@ var patternDirective = function($parse) {
         // ngPattern might be a scope expression, or an inlined regex, which is not parsable.
         // We get value of the attribute here, so we can compare the old and the new value
         // in the observer to avoid unnecessary validations
-        try {
+        if (tAttr.ngPattern.charAt(0) === '/' && REGEX_STRING_REGEXP.test(tAttr.ngPattern)) {
+          parseFn = function() { return tAttr.ngPattern; };
+        } else {
           parseFn = $parse(tAttr.ngPattern);
-        } catch (e) {
-          if (/^\[\$parse:lexerr\]/.test(e.message)) {
-            parseFn = function() { return tAttr.ngPattern; };
-          } else {
-            throw e;
-          }
         }
       }
 
@@ -199,6 +195,8 @@ var patternDirective = function($parse) {
 
         if (attr.ngPattern) {
           attrVal = parseFn(scope);
+        } else {
+          patternExp = attr.pattern;
         }
 
         var regexp = parsePatternAttr(attrVal, patternExp, elm);
@@ -420,7 +418,7 @@ function parsePatternAttr(regex, patternExp, elm) {
     regex = new RegExp('^' + regex + '$');
   }
 
-  if (!(regex instanceof RegExp)) {
+  if (!regex.test) {
     throw minErr('ngPattern')('noregexp',
       'Expected {0} to be a RegExp but was {1}. Element: {2}', patternExp,
       regex, startingTag(elm));

test/ng/directive/inputSpec.js

@@ -848,8 +848,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.min).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="month" ng-model="value" validation-spy="min" ng-min="minVal" />' +
           '</div>');
@@ -925,8 +923,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.max).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="month" ng-model="value" validation-spy="max" ng-max="maxVal" />' +
           '</div>');
@@ -1159,8 +1155,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.min).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="week" ng-model="value" validation-spy="min" ng-min="minVal" />' +
           '</div>');
@@ -1239,8 +1233,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.max).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="week" ng-model="value" validation-spy="max" ng-max="maxVal" />' +
           '</div>');
@@ -1587,8 +1579,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.min).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="datetime-local" ng-model="value" validation-spy="min" ng-min="minVal" />' +
           '</div>');
@@ -1665,8 +1655,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.max).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="datetime-local" ng-model="value" validation-spy="max" ng-max="maxVal" />' +
           '</div>');
@@ -2090,8 +2078,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.min).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="time" ng-model="value" validation-spy="min" ng-min="minVal" />' +
           '</div>');
@@ -2155,8 +2141,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.max).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="time" ng-model="value" validation-spy="max" ng-max="maxVal" />' +
           '</div>');
@@ -2518,8 +2502,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.min).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="date" ng-model="value" validation-spy="min" ng-min="minVal" />' +
           '</div>');
@@ -2607,8 +2589,6 @@ describe('input', function() {
 
         expect(helper.validationCounter.max).toBe(1);
 
-        helper.validationCounter = {};
-
         inputElm = helper.compileInput('<div ng-repeat="input in [0]">' +
           '<input type="date" ng-model="value" validation-spy="max" ng-max="maxVal" />' +
           '</div>');

test/ng/directive/validatorsSpec.js

@@ -244,8 +244,6 @@ describe('validators', function() {
 
       expect(helper.validationCounter.pattern).toBe(1);
 
-      helper.validationCounter = {};
-
       helper.compileInput(
          '<div ng-repeat="input in [0]">' +
            '<input type="text" ng-model="value" ng-pattern="pattern" validation-spy="pattern" />' +
@@ -351,8 +349,6 @@ describe('validators', function() {
 
       expect(helper.validationCounter.minlength).toBe(1);
 
-      helper.validationCounter = {};
-
       element = helper.compileInput(
          '<div ng-repeat="input in [0]">' +
            '<input type="text" ng-model="value" ng-minlength="minlength" validation-spy="minlength" />' +
@@ -563,8 +559,6 @@ describe('validators', function() {
 
       expect(helper.validationCounter.maxlength).toBe(1);
 
-      helper.validationCounter = {};
-
       element = helper.compileInput(
          '<div ng-repeat="input in [0]">' +
            '<input type="text" ng-model="value" ng-maxlength="maxlength" validation-spy="maxlength" />' +
@@ -711,8 +705,6 @@ describe('validators', function() {
       $rootScope.$digest();
 
       expect(helper.validationCounter.required).toBe(1);
-
-      helper.validationCounter = {};
     });