Commit c47a2538 by dhn

验证

parent 7b798d95
......@@ -27,7 +27,7 @@ define([
var loginForm = $('.form.form-login');
var addressForm = $('#checkout-step-shipping>#co-shipping-form');
if (loginForm.length > 0 && !loginForm.validates().form()) {
if (loginForm.length > 0 && !loginForm.validate().form()) {
return false;
}
if (addressForm.length > 0) {
......@@ -51,7 +51,7 @@ define([
$(selectInput[i]).attr('name',selectName)
}
}
if (!addressForm.validates().form()) {
if (!addressForm.validate().form()) {
if(selectInput.length > 0){
for(var i=0;i<selectInput.length;i++){
$(selectInput[i]).removeAttr('name')
......@@ -112,7 +112,7 @@ define([
$(selectInput[i]).attr('name',selectName)
}
}
if (!billadressForm.validates().form()) {
if (!billadressForm.validate().form()) {
if(selectInput.length > 0){
for(var i=0;i<selectInput.length;i++){
$(selectInput[i]).removeAttr('name')
......
......@@ -30,7 +30,6 @@ var config = {
},
paths: {
'jquery/validate': 'jquery/jquery.validate',
'jquery/validates': 'jquery/jquery.validates',
'jquery/hover-intent': 'jquery/jquery.hoverIntent',
'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader',
'prototype': 'legacy-build.min',
......
......@@ -13,7 +13,6 @@ define([
'moment',
'tinycolor',
'jquery/validate',
'jquery/validates',
'mage/translate'
], function ($, _, utils, moment, tinycolor) {
'use strict';
......
......@@ -695,43 +695,55 @@
},
showLabel: function (element, message) {
var label = this.errorsFor(element);
if (label.length) {
// refresh error/success class
label.removeClass(this.settings.validClass).addClass(this.settings.errorClass);
// check if we have a generated label, replace the message then
if (label.attr("generated")) {
label.hide().html(message);
if($('body').hasClass('checkout-index-index'))
{
if($(element).is('select')){
$(element).prev('input').addClass('error-border-style');
}else if($(element).is('input')){
$(element).addClass('error-border-style');
}
} else {
// create label
label = $("<" + this.settings.errorElement + "/>")
.attr({"for": this.idOrName(element), generated: true})
.addClass(this.settings.errorClass)
.html(message || "");
if (this.settings.wrapper) {
// make sure the element is visible, even in IE
// actually showing the wrapped element is handled elsewhere
label = label.hide().show().wrap("<" + this.settings.wrapper + "/>").parent();
this.toShow = this.toShow.add('');
}
else {
var label = this.errorsFor(element);
if (label.length) {
// refresh error/success class
label.removeClass(this.settings.validClass).addClass(this.settings.errorClass);
// check if we have a generated label, replace the message then
if (label.attr("generated")) {
label.hide().html(message);
}
} else {
// create label
label = $("<" + this.settings.errorElement + "/>")
.attr({"for": this.idOrName(element), generated: true})
.addClass(this.settings.errorClass)
.html(message || "");
if (this.settings.wrapper) {
// make sure the element is visible, even in IE
// actually showing the wrapped element is handled elsewhere
label = label.hide().show().wrap("<" + this.settings.wrapper + "/>").parent();
}
if (!this.labelContainer.append(label).length) {
if (this.settings.errorPlacement) {
this.settings.errorPlacement(label, $(element));
} else {
label.insertAfter(element);
}
}
}
if (!this.labelContainer.append(label).length) {
if (this.settings.errorPlacement) {
this.settings.errorPlacement(label, $(element));
if (!message && this.settings.success) {
label.text("");
if (typeof this.settings.success === "string") {
label.addClass(this.settings.success);
} else {
label.insertAfter(element);
this.settings.success(label, element);
}
}
this.toShow = this.toShow.add(label);
}
if (!message && this.settings.success) {
label.text("");
if (typeof this.settings.success === "string") {
label.addClass(this.settings.success);
} else {
this.settings.success(label, element);
}
}
this.toShow = this.toShow.add(label);
},
errorsFor: function (element) {
......
......@@ -9,7 +9,6 @@ define([
'mageUtils',
'jquery-ui-modules/widget',
'jquery/validate',
'jquery/validates',
'mage/translate'
], function ($, moment, utils) {
'use strict';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment