nghuuphuoc 11 years ago
parent
commit
8462c067b8
3 changed files with 14 additions and 16 deletions
  1. 6 7
      dist/js/bootstrapValidator.js
  2. 2 2
      dist/js/bootstrapValidator.min.js
  3. 6 7
      src/js/bootstrapValidator.js

+ 6 - 7
dist/js/bootstrapValidator.js

@@ -324,7 +324,7 @@
                     $parent   = $field.parents(group),
                     // Allow user to indicate where the error messages are shown
                     container = this.options.fields[field].container || this.options.container,
-                    $message  = (container && container != 'tooltip' && container != 'popover') ? $(container) : this._getMessageContainer($field);
+                    $message  = (container && container != 'tooltip' && container != 'popover') ? $(container) : this._getMessageContainer($field, group);
 
                 if (container && container != 'tooltip' && container != 'popover') {
                     $message.addClass('has-error');
@@ -421,19 +421,18 @@
          * Get the element to place the error messages
          *
          * @param {jQuery} $field The field element
+         * @param {String} group
          * @returns {jQuery}
          */
-        _getMessageContainer: function($field) {
-            var $parent = $field.parent(),
-                field   = $field.attr('data-bv-field'),
-                group   = this.options.fields[field].group || this.options.group;
+        _getMessageContainer: function($field, group) {
+            var $parent = $field.parent();
             if ($parent.is(group)) {
                 return $parent;
             }
 
             var cssClasses = $parent.attr('class');
             if (!cssClasses) {
-                return this._getMessageContainer($parent);
+                return this._getMessageContainer($parent, group);
             }
 
             cssClasses = cssClasses.split(' ');
@@ -444,7 +443,7 @@
                 }
             }
 
-            return this._getMessageContainer($parent);
+            return this._getMessageContainer($parent, group);
         },
 
         /**

File diff suppressed because it is too large
+ 2 - 2
dist/js/bootstrapValidator.min.js


+ 6 - 7
src/js/bootstrapValidator.js

@@ -323,7 +323,7 @@
                     $parent   = $field.parents(group),
                     // Allow user to indicate where the error messages are shown
                     container = this.options.fields[field].container || this.options.container,
-                    $message  = (container && container != 'tooltip' && container != 'popover') ? $(container) : this._getMessageContainer($field);
+                    $message  = (container && container != 'tooltip' && container != 'popover') ? $(container) : this._getMessageContainer($field, group);
 
                 if (container && container != 'tooltip' && container != 'popover') {
                     $message.addClass('has-error');
@@ -420,19 +420,18 @@
          * Get the element to place the error messages
          *
          * @param {jQuery} $field The field element
+         * @param {String} group
          * @returns {jQuery}
          */
-        _getMessageContainer: function($field) {
-            var $parent = $field.parent(),
-                field   = $field.attr('data-bv-field'),
-                group   = this.options.fields[field].group || this.options.group;
+        _getMessageContainer: function($field, group) {
+            var $parent = $field.parent();
             if ($parent.is(group)) {
                 return $parent;
             }
 
             var cssClasses = $parent.attr('class');
             if (!cssClasses) {
-                return this._getMessageContainer($parent);
+                return this._getMessageContainer($parent, group);
             }
 
             cssClasses = cssClasses.split(' ');
@@ -443,7 +442,7 @@
                 }
             }
 
-            return this._getMessageContainer($parent);
+            return this._getMessageContainer($parent, group);
         },
 
         /**