Merge pull request #64 from alfredobarron/dev

update 2.2.0

Gruntfile.js

@@ -37,7 +37,7 @@ module.exports = function(grunt){
         compress: {
           main: {
             options: {
-              archive: 'smoke-v2.1.6.zip'
+              archive: 'smoke-v2.2.0.zip'
             },
             files: [
               //{src: ['path/*'], dest: 'internal_folder/', filter: 'isFile'}, // includes files in path

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "smoke",
-  "version": "2.1.6",
+  "version": "2.2.0",
   "description": "Smoke is the most complete jQuery Plugin and designed for use with Bootstrap 3",
   "license": "LGPL",
   "authors": [

dist/css/smoke.css

@@ -21,7 +21,7 @@
 |   Validate
 |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-.smk-error-text{
+.has-feedback .smk-error-text{
     position: absolute;
     right: 0;
     font-size: 12px;
@@ -32,8 +32,20 @@
 .smk-select .smk-error-icon{
     right: 10px;
 }
-.smk-checkbox .smk-error-text, .smk-radio .smk-error-text{
-    margin-top: -12px
+.smk-checkbox .smk-error-text,
+.smk-radio .smk-error-text{
+    margin-top: -12px;
+}
+/* form-horizontal */
+.form-horizontal .has-feedback .smk-error-text {
+    right: 15px;
+}
+.form-horizontal .smk-select .smk-error-icon{
+    right: 25px;
+}
+.form-horizontal .smk-checkbox .smk-error-text,
+.form-horizontal .smk-radio .smk-error-text{
+    margin-top: 0;
 }
 
 

dist/js/smoke.js

@@ -471,8 +471,10 @@ $.fn.smkClear = function(options) {
 */
 $.smkAddError = function (obj, text)
 {
+    // Se obtiene el elemento form-group
+    var formGroup = $(obj).parents('.form-group');
     // Se obtiene el elemento padre
-    var parent = $(obj).parents('.form-group');
+    var parent = $(obj).parent();
     // Se obtiene el type
     var type = $(obj).attr('type');
     // Se obtiene el tag
@@ -496,19 +498,20 @@ $.smkAddError = function (obj, text)
 
     if(type == 'select'){
         // Se agrega la clase de error
-        parent.addClass('has-feedback has-error smk-' + type);
+        formGroup.addClass('has-feedback has-error smk-' + type);
         // Se agrega el icono y el mensaje de error
         parent.append(icon + msj);
     }else if(type == 'checkbox' || type == 'radio'){
         // Se agrega la clase de error
-        parent.addClass('has-feedback has-error smk-' + type);
+        formGroup.addClass('has-feedback has-error smk-' + type);
         // Se agrega el icono y el mensaje de error
-        parent.append(msj);
+        parent.parent().parent().append(msj);
     }else{
         // Se agrega la clase de error
-        parent.addClass('has-feedback has-error');
+        formGroup.addClass('has-feedback has-error');
         // Se agrega el icono y el mensaje de error
         parent.append(icon + msj);
+
     }
     // Se posiciona el focus en el input
     obj.focus();