|
72 | 72 | .text(help)
|
73 | 73 | .hide();
|
74 | 74 | }
|
75 |
| - |
| 75 | + |
76 | 76 | $element
|
77 | 77 | .addClass('has-help-txt')
|
78 | 78 | .bind('focus.validation', function() {
|
|
123 | 123 | if ($parent.hasClass('input-group')){
|
124 | 124 | var $parent = $parent.parent();
|
125 | 125 | }
|
126 |
| - |
| 126 | + |
127 | 127 | // Remove possible error style applied by previous validation
|
128 | 128 | $element
|
129 | 129 | .removeClass(config.errorElementClass)
|
|
132 | 132 | .find('.'+config.errorMessageClass).remove();
|
133 | 133 |
|
134 | 134 | // Twitter bs
|
135 |
| - $form.find('.has-error').removeClass('has-error'); |
136 | 135 | $element.removeClass('valid');
|
137 |
| - $element |
138 |
| - .parent() |
139 |
| - .removeClass('has-success'); |
| 136 | + $parent.removeClass('has-error'); |
| 137 | + $parent.removeClass('has-success'); |
140 | 138 |
|
141 | 139 | // if element has custom err msg container, clear it
|
142 | 140 | if( elementErrMsgObj != null) {
|
|
149 | 147 |
|
150 | 148 | if(validation === true) {
|
151 | 149 | $element
|
152 |
| - .addClass('valid') |
153 |
| - .parent() |
154 |
| - .removeClass('has-error') |
| 150 | + .addClass('valid'); |
| 151 | + $parent |
155 | 152 | .addClass('has-success'); // twitter bs
|
156 | 153 | } else if(validation === null) {
|
157 | 154 | $element
|
158 |
| - .removeClass('valid') |
159 |
| - .parent() |
| 155 | + .removeClass('valid'); |
| 156 | + $parent |
160 | 157 | .removeClass('has-error')
|
161 | 158 | .removeClass('has-success'); // twitter bs
|
162 | 159 | } else {
|
163 | 160 | $element
|
164 | 161 | .addClass(config.errorElementClass)
|
165 |
| - .removeClass('valid') |
166 |
| - .parent() |
| 162 | + .removeClass('valid'); |
| 163 | + $parent |
167 | 164 | .addClass('has-error')
|
168 | 165 | .removeClass('has-success'); // twitter bs
|
169 | 166 |
|
|
172 | 169 | elementErrMsgObj.innerHTML = validation;
|
173 | 170 | } else { // use regular span append
|
174 | 171 | $parent.append('<span class="'+config.errorMessageClass+' help-block">'+validation+'</span>');
|
175 |
| - $element |
176 |
| - .parent() |
177 |
| - .addClass('has-error'); // twitter bs |
| 172 | + $parent.addClass('has-error'); // twitter bs |
178 | 173 | }
|
179 | 174 |
|
180 | 175 | if(config.borderColorOnError !== '') {
|
|
232 | 227 | * @para {jQuery} $element
|
233 | 228 | */
|
234 | 229 | var addErrorMessage = function(mess, $element) {
|
| 230 | + var $parent = $element.parent(); |
| 231 | + // Twitter bs |
| 232 | + if ($parent.hasClass('input-group')){ |
| 233 | + var $parent = $parent.parent(); |
| 234 | + } |
| 235 | + |
235 | 236 | // validate server side will return null as error message before the server is requested
|
236 | 237 | if(mess !== null) {
|
237 | 238 | if ($.inArray(mess, errorMessages) < 0) {
|
|
240 | 241 | errorInputs.push($element);
|
241 | 242 | $element
|
242 | 243 | .valAttr('current-error', mess)
|
243 |
| - .removeClass('valid') |
244 |
| - .parent() |
| 244 | + .removeClass('valid'); |
| 245 | + $parent |
245 | 246 | .removeClass('has-success');
|
246 | 247 | }
|
247 | 248 | },
|
|
274 | 275 | //
|
275 | 276 | $form.find('input,textarea,select').filter(':not([type="submit"],[type="button"])').each(function() {
|
276 | 277 | var $element = $(this);
|
| 278 | + var $parent = $element.parent(); |
| 279 | + // Twitter bs |
| 280 | + if ($parent.hasClass('input-group')){ |
| 281 | + var $parent = $parent.parent(); |
| 282 | + } |
| 283 | + |
277 | 284 | var elementType = $element.attr('type');
|
278 | 285 | if (!ignoreInput($element.attr('name'), elementType)) {
|
279 | 286 |
|
|
292 | 299 | } else {
|
293 | 300 | $element
|
294 | 301 | .valAttr('current-error', false)
|
295 |
| - .addClass('valid') |
296 |
| - .parent() |
297 |
| - .addClass('has-success'); |
| 302 | + .addClass('valid'); |
| 303 | + $parent |
| 304 | + .addClass('has-success'); |
298 | 305 | }
|
299 | 306 | }
|
300 | 307 |
|
|
864 | 871 | year = findDateUnit('y', formatParts, matches);
|
865 | 872 |
|
866 | 873 | if ((month === 2 && day > 28 && (year % 4 !== 0 || year % 100 === 0 && year % 400 !== 0))
|
867 |
| - || (month === 2 && day > 29 && (year % 4 === 0 || year % 100 !== 0 && year % 400 === 0)) |
868 |
| - || month > 12 || month === 0) { |
| 874 | + || (month === 2 && day > 29 && (year % 4 === 0 || year % 100 !== 0 && year % 400 === 0)) |
| 875 | + || month > 12 || month === 0) { |
869 | 876 | return false;
|
870 | 877 | }
|
871 | 878 | if ((this.isShortMonth(month) && day > 30) || (!this.isShortMonth(month) && day > 31) || day === 0) {
|
|
0 commit comments