Merge branch 'jjcosare-master'

kelp404 · Jul 26, 2014 · 3b1db94 · 3b1db94
2 parents b488f48 + 2437287
commit 3b1db94
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ node_modules
 bower_components
 
 # compass
-.sass-cache
+.sass-cache
+.project
diff --git a/dist/angular-validator.js b/dist/angular-validator.js
diff --git a/dist/angular-validator.min.js b/dist/angular-validator.min.js
diff --git a/src/provider.coffee b/src/provider.coffee
@@ -45,8 +45,11 @@ angular.module 'validator.provider', []
                     for label in parent.find('label') when $(label).hasClass 'error'
                         $(label).remove()
                     $label = $ "<label class='control-label error'>#{errorMessage}</label>"
-                    $label.attr 'for', attrs.id if attrs.id
-                    $(element).parent().append $label
+                    $label.attr('for', attrs.id) if attrs.id
+                    if $(element).parent().hasClass 'input-group'
+                        $(element).parent().parent().append $label
+                    else
+                        $(element).parent().append $label
                     break
                 parent = parent.parent()