From 56fee292c37e162c03fab9eeadd6a8b9ab85c251 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 4 Sep 2006 19:15:47 +0000
Subject: merge from 3.0 branch till 1387

---
 framework/Web/Javascripts/js/debug/ajax.js      |  2 +-
 framework/Web/Javascripts/js/debug/prado.js     | 18 ++++++++++++++----
 framework/Web/Javascripts/js/debug/validator.js |  4 ++--
 3 files changed, 17 insertions(+), 7 deletions(-)

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

diff --git a/framework/Web/Javascripts/js/debug/ajax.js b/framework/Web/Javascripts/js/debug/ajax.js
index 61881bf9..3ea8acce 100644
--- a/framework/Web/Javascripts/js/debug/ajax.js
+++ b/framework/Web/Javascripts/js/debug/ajax.js
@@ -2079,7 +2079,7 @@ Prado.WebUI.TAutoComplete = Class.extend(Prado.WebUI.TAutoComplete,
 	{
 		if(!this.active)
 		{
-			request = new Prado.CallbackRequest(options.EventTarget, options);
+			request = new Prado.CallbackRequest(this.options.EventTarget, options);
 			request.dispatch();
 			Event.stop(event);
 		}
diff --git a/framework/Web/Javascripts/js/debug/prado.js b/framework/Web/Javascripts/js/debug/prado.js
index ee228240..c890ccdb 100644
--- a/framework/Web/Javascripts/js/debug/prado.js
+++ b/framework/Web/Javascripts/js/debug/prado.js
@@ -2004,10 +2004,19 @@ Object.extend(Event,
 			}
 			else if(Event.isMouseEvent(type))
 			{
-				var event = document.createEvent('MouseEvents');
-				event.initMouseEvent(type,true,true,
-					document.defaultView, 1, 0, 0, 0, 0, false, 
-							false, false, false, 0, null);
+				var event = document.createEvent('MouseEvents');				
+				if (event.initMouseEvent)
+		        {
+					event.initMouseEvent(type,true,true,
+						document.defaultView, 1, 0, 0, 0, 0, false, 
+								false, false, false, 0, null);
+		        }
+		        else
+		        {
+		            // Safari
+		            // TODO we should be initialising other mouse-event related attributes here
+		            event.initEvent(type, true, true);
+		        }
 			}
             element.dispatchEvent(event);
         }
@@ -3461,6 +3470,7 @@ Prado.WebUI.DefaultButton.prototype =
 			if(defaultButton)
 			{
 				this.triggered = true;
+				$('PRADO_POSTBACK_TARGET').value = this.options.EventTarget;				
 				Event.fireEvent(defaultButton, this.options['Event']);
 				Event.stop(ev);
 			}
diff --git a/framework/Web/Javascripts/js/debug/validator.js b/framework/Web/Javascripts/js/debug/validator.js
index d068900c..dbc180cf 100644
--- a/framework/Web/Javascripts/js/debug/validator.js
+++ b/framework/Web/Javascripts/js/debug/validator.js
@@ -357,7 +357,7 @@ Prado.WebUI.TValidationSummary.prototype =
 	 * options['DisplayMode']		Summary display style, 'BulletList', 'List', 'SingleParagraph'
 	 * options['Refresh']			True to update the summary upon validator state change.
 	 * options['ValidationGroup']	Validation summary group
-	 * options['Display']			Display mode, 'None', 'Static', 'Dynamic'.
+	 * options['Display']			Display mode, 'None', 'Fixed', 'Dynamic'.
 	 * options['ScrollToSummary']	True to scroll to the validation summary upon refresh.
 	 * </code>
 	 */
@@ -564,7 +564,7 @@ Prado.WebUI.TBaseValidator.prototype =
 	 * options['ID']*				Validator ID, e.g. span with message
 	 * options['FormID']*			HTML form that the validator belongs
 	 * options['ControlToValidate']*HTML form input to validate
-	 * options['Display']			Display mode, 'None', 'Static', 'Dynamic'
+	 * options['Display']			Display mode, 'None', 'Fixed', 'Dynamic'
 	 * options['ErrorMessage']		Validation error message
 	 * options['FocusOnError']		True to focus on validation error
 	 * options['FocusElementID']	Element to focus on error
-- 
cgit v1.2.3