summaryrefslogtreecommitdiff
path: root/framework/Web/Javascripts/js
diff options
context:
space:
mode:
authorxue <>2006-04-17 02:04:06 +0000
committerxue <>2006-04-17 02:04:06 +0000
commit52e7a15e90626989b53925ff9c573691154fd79f (patch)
tree12b73016f2607c10af4f30c52d5a5a94bf189a04 /framework/Web/Javascripts/js
parent9db90898be134c9f70c0b334ec071223e60ed76c (diff)
Merge from 3.0 branch till 928.
Diffstat (limited to 'framework/Web/Javascripts/js')
-rw-r--r--framework/Web/Javascripts/js/prado.js5
-rw-r--r--framework/Web/Javascripts/js/validator.js6
2 files changed, 3 insertions, 8 deletions
diff --git a/framework/Web/Javascripts/js/prado.js b/framework/Web/Javascripts/js/prado.js
index 36c1f658..794114d9 100644
--- a/framework/Web/Javascripts/js/prado.js
+++ b/framework/Web/Javascripts/js/prado.js
@@ -1681,10 +1681,7 @@ _381=Prado.Validation.ValidateValidationGroup(_379["ValidationGroup"]);
_381=Prado.Validation.ValidateNonGroup(form);
}
if(!_381){
-if(_379["StopEvent"]){
-Event.stop(_378);
-}
-return;
+return Event.stop(_378);
}
}
if(_379["PostBackUrl"]&&_379["PostBackUrl"].length>0){
diff --git a/framework/Web/Javascripts/js/validator.js b/framework/Web/Javascripts/js/validator.js
index b5321743..867efc22 100644
--- a/framework/Web/Javascripts/js/validator.js
+++ b/framework/Web/Javascripts/js/validator.js
@@ -144,10 +144,8 @@ var _42=Prado.Validation.validators;
for(var i=0;i<_42.length;i++){
_42[i].enabled=!_42[i].control||undef(_42[i].control.form)||_42[i].control.form==_40;
_42[i].visible=Prado.Validation.IsGroupValidation?_42[i].inActiveGroup():true;
-if(Prado.Validation.HasTargetGroup||_42[i].group){
-if(_42[i].group!=Prado.Validation.CurrentTargetGroup){
-_42[i].enabled=false;
-}
+if(Prado.Validation.HasTargetGroup){
+_42[i].enabled=Prado.Validation.CurrentTargetGroup==_42[i].group;
}
_41&=_42[i].validate();
}