From 636ede11afd0127f00e7d7db709c95ad68f4101f Mon Sep 17 00:00:00 2001
From: wei <>
Date: Mon, 17 Apr 2006 01:47:46 +0000
Subject: Fixing #93, xue: please close ticket if your FT passes tests (it does
 pass on my IE, FF).

---
 framework/Web/Javascripts/js/prado.js     | 5 +----
 framework/Web/Javascripts/js/validator.js | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'framework/Web/Javascripts/js')

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();
 }
-- 
cgit v1.2.3