From 1f63d5c05ba117e0158c02d5bc79fa1f38f8ce85 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 27 Apr 2006 13:13:17 +0000
Subject: merge from 3.0 branch till 978.

---
 framework/Web/Javascripts/js/prado.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/framework/Web/Javascripts/js/prado.js b/framework/Web/Javascripts/js/prado.js
index c7145188..394d5eeb 100644
--- a/framework/Web/Javascripts/js/prado.js
+++ b/framework/Web/Javascripts/js/prado.js
@@ -1803,9 +1803,9 @@ var newdate=new Date(year,month-1,date, 0, 0, 0);
 return newdate;
 }
 });
-var Prado = 
-{ 
-Version: '3.0a',
+var Prado =
+{
+Version: '3.0.0',
 Browser : function()
 {
 var info = { Version : "1.0" };
@@ -1830,11 +1830,11 @@ info.opera7 = ( ( info.agent.toLowerCase().indexOf( 'opera 7' ) > -1 ) || ( info
 info.operaOld = info.opera && !info.opera7;
 return info;
 },
-ImportCss : function(doc, css_file) 
+ImportCss : function(doc, css_file)
 {
 if (Prado.Browser().ie)
 var styleSheet = doc.createStyleSheet(css_file);
-else 
+else
 {
 var elm = doc.createElement("link");
 elm.rel = "stylesheet";
@@ -1850,7 +1850,7 @@ var form = $(options['FormID']);
 var canSubmit = true;
 if(options['CausesValidation'] && typeof(Prado.Validation) != "undefined")
 {
-if(!Prado.Validation.validate(options['FormID'], options['ValidationGroup']))
+if(!Prado.Validation.validate(options['FormID'], options['ValidationGroup'], $(options['ID'])))
 return Event.stop(event);
 }
 if(options['PostBackUrl'] && options['PostBackUrl'].length > 0)
-- 
cgit v1.2.3