merge from 3.0 branch till 1387

1 files changed, 14 insertions, 4 deletions

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);

 			}