Revert "works with inputs without the form-control class"

This reverts commit e93c512.
jantimon · Jan 19, 2015 · 9c2faf8 · 9c2faf8
1 parent 8d9bada
commit 9c2faf8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/showErrors.coffee b/src/showErrors.coffee
@@ -21,11 +21,11 @@ showErrorsModule.directive 'showErrors',
       showSuccess = getShowSuccess options
       trigger = getTrigger options
 
-      inputEl   = el[0].querySelector 'input[name]'
+      inputEl   = el[0].querySelector '.form-control[name]'
       inputNgEl = angular.element inputEl
       inputName = $interpolate(inputNgEl.attr('name') || '')(scope)
       unless inputName
-        throw "show-errors element has no child input element with a 'name' attribute"
+        throw "show-errors element has no child input elements with a 'name' attribute and a 'form-control' class"
 
       inputNgEl.bind trigger, ->
         blurred = true

diff --git a/src/showErrors.js b/src/showErrors.js
@@ -28,11 +28,11 @@
         options = scope.$eval(attrs.showErrors);
         showSuccess = getShowSuccess(options);
         trigger = getTrigger(options);
-        inputEl = el[0].querySelector('input[name]');
+        inputEl = el[0].querySelector('.form-control[name]');
         inputNgEl = angular.element(inputEl);
         inputName = $interpolate(inputNgEl.attr('name') || '')(scope);
         if (!inputName) {
-          throw "show-errors element has no child input element with a 'name' attribute";
+          throw "show-errors element has no child input elements with a 'name' attribute and a 'form-control' class";
         }
         inputNgEl.bind(trigger, function() {
           blurred = true;

diff --git a/src/showErrors.min.js b/src/showErrors.min.js
diff --git a/test/showErrors.spec.coffee b/test/showErrors.spec.coffee
@@ -27,11 +27,11 @@ describe 'showErrors', ->
     $scope.$digest()
     el
 
-  describe 'directive does not contain an input element with a "name" attribute', ->
+  describe 'directive does not contain an input element with a form-control class and name attribute', ->
     it 'throws an exception', ->
       expect( ->
-        $compile('<form name="userForm"><div class="form-group" show-errors><input type="text" ></input></div></form>')($scope)
-      ).toThrow "show-errors element has no child input element with a 'name' attribute"
+        $compile('<form name="userForm"><div class="form-group" show-errors><input type="text" name="firstName"></input></div></form>')($scope)
+      ).toThrow "show-errors element has no child input elements with a 'name' attribute and a 'form-control' class"
 
   it "throws an exception if the element doesn't have the form-group or input-group class", ->
     expect( ->

diff --git a/test/showErrors.spec.js b/test/showErrors.spec.js
@@ -28,11 +28,11 @@
       $scope.$digest();
       return el;
     };
-    describe('directive does not contain an input element with a "name" attribute', function() {
+    describe('directive does not contain an input element with a form-control class and name attribute', function() {
       return it('throws an exception', function() {
         return expect(function() {
-          return $compile('<form name="userForm"><div class="form-group" show-errors><input type="text" ></input></div></form>')($scope);
-        }).toThrow("show-errors element has no child input element with a 'name' attribute");
+          return $compile('<form name="userForm"><div class="form-group" show-errors><input type="text" name="firstName"></input></div></form>')($scope);
+        }).toThrow("show-errors element has no child input elements with a 'name' attribute and a 'form-control' class");
       });
     });
     it("throws an exception if the element doesn't have the form-group or input-group class", function() {