Skip to content

J
joshine
Commit c47a2538 by dhn
Options

验证

parent 7b798d95
Showing with 46 additions and 37 deletions
app/code/Magento/Checkout/view/frontend/web/js/view/part.js
...@@ -27,7 +27,7 @@ define([ ...@@ -27,7 +27,7 @@ define([
var loginForm = $('.form.form-login'); var loginForm = $('.form.form-login');
var addressForm = $('#checkout-step-shipping>#co-shipping-form'); var addressForm = $('#checkout-step-shipping>#co-shipping-form');
if (loginForm.length > 0 && !loginForm.validates().form()) { if (loginForm.length > 0 && !loginForm.validate().form()) {
return false; return false;
} }
if (addressForm.length > 0) { if (addressForm.length > 0) {
...@@ -51,7 +51,7 @@ define([ ...@@ -51,7 +51,7 @@ define([
$(selectInput[i]).attr('name',selectName) $(selectInput[i]).attr('name',selectName)
} }
} }
if (!addressForm.validates().form()) { if (!addressForm.validate().form()) {
if(selectInput.length > 0){ if(selectInput.length > 0){
for(var i=0;i<selectInput.length;i++){ for(var i=0;i<selectInput.length;i++){
$(selectInput[i]).removeAttr('name') $(selectInput[i]).removeAttr('name')
...@@ -112,7 +112,7 @@ define([ ...@@ -112,7 +112,7 @@ define([
$(selectInput[i]).attr('name',selectName) $(selectInput[i]).attr('name',selectName)
} }
} }
if (!billadressForm.validates().form()) { if (!billadressForm.validate().form()) {
if(selectInput.length > 0){ if(selectInput.length > 0){
for(var i=0;i<selectInput.length;i++){ for(var i=0;i<selectInput.length;i++){
$(selectInput[i]).removeAttr('name') $(selectInput[i]).removeAttr('name')
......
app/code/Magento/Theme/view/base/requirejs-config.js
...@@ -30,7 +30,6 @@ var config = { ...@@ -30,7 +30,6 @@ var config = {
}, },
paths: { paths: {
'jquery/validate': 'jquery/jquery.validate', 'jquery/validate': 'jquery/jquery.validate',
'jquery/validates': 'jquery/jquery.validates',
'jquery/hover-intent': 'jquery/jquery.hoverIntent', 'jquery/hover-intent': 'jquery/jquery.hoverIntent',
'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader', 'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader',
'prototype': 'legacy-build.min', 'prototype': 'legacy-build.min',
......
app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
...@@ -13,7 +13,6 @@ define([ ...@@ -13,7 +13,6 @@ define([
'moment', 'moment',
'tinycolor', 'tinycolor',
'jquery/validate', 'jquery/validate',
'jquery/validates',
'mage/translate' 'mage/translate'
], function ($, _, utils, moment, tinycolor) { ], function ($, _, utils, moment, tinycolor) {
'use strict'; 'use strict';
......
lib/web/jquery/jquery.validate.js
...@@ -695,43 +695,55 @@ ...@@ -695,43 +695,55 @@
}, },
showLabel: function (element, message) { showLabel: function (element, message) {
var label = this.errorsFor(element); if($('body').hasClass('checkout-index-index'))
if (label.length) { {
// refresh error/success class if($(element).is('select')){
label.removeClass(this.settings.validClass).addClass(this.settings.errorClass); $(element).prev('input').addClass('error-border-style');
}else if($(element).is('input')){
// check if we have a generated label, replace the message then $(element).addClass('error-border-style');
if (label.attr("generated")) {
label.hide().html(message);
} }
} else { this.toShow = this.toShow.add('');
// create label }
label = $("<" + this.settings.errorElement + "/>") else {
.attr({"for": this.idOrName(element), generated: true}) var label = this.errorsFor(element);
.addClass(this.settings.errorClass) if (label.length) {
.html(message || ""); // refresh error/success class
if (this.settings.wrapper) { label.removeClass(this.settings.validClass).addClass(this.settings.errorClass);
// make sure the element is visible, even in IE
// actually showing the wrapped element is handled elsewhere // check if we have a generated label, replace the message then
label = label.hide().show().wrap("<" + this.settings.wrapper + "/>").parent(); 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 (!message && this.settings.success) {
if (this.settings.errorPlacement) { label.text("");
this.settings.errorPlacement(label, $(element)); if (typeof this.settings.success === "string") {
label.addClass(this.settings.success);
} else { } 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) { errorsFor: function (element) {
......
lib/web/mage/validation.js
...@@ -9,7 +9,6 @@ define([ ...@@ -9,7 +9,6 @@ define([
'mageUtils', 'mageUtils',
'jquery-ui-modules/widget', 'jquery-ui-modules/widget',
'jquery/validate', 'jquery/validate',
'jquery/validates',
'mage/translate' 'mage/translate'
], function ($, moment, utils) { ], function ($, moment, utils) {
'use strict'; '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