Merge from 3.0 branch till 1156.

2 files changed, 6 insertions, 3 deletions

diff --git a/framework/Web/Javascripts/js/prado.js b/framework/Web/Javascripts/js/prado.js
index 5f52fece..65ffd1b8 100644
--- a/framework/Web/Javascripts/js/prado.js
+++ b/framework/Web/Javascripts/js/prado.js
@@ -247,8 +247,7 @@ form.action=options['PostBackUrl'];if(options['TrackFocus'])
 {var active=document.activeElement;if(active)
 lastFocus.value=active.id;else
 lastFocus.value=options['EventTarget'];}}
-$('PRADO_POSTBACK_TARGET').value=options['EventTarget'];$('PRADO_POSTBACK_PARAMETER').value=options['EventParameter'];if(options['StopEvent'])
-Event.stop(event);Event.fireEvent(form,"submit");}
+$('PRADO_POSTBACK_TARGET').value=options['EventTarget'];$('PRADO_POSTBACK_PARAMETER').value=options['EventParameter'];Event.stop(event);Event.fireEvent(form,"submit");}
 Prado.Element={setValue:function(element,value)
 {var el=$(element);if(el&&typeof(el.value)!="undefined")
 el.value=value;},select:function(element,method,value)
diff --git a/framework/Web/Javascripts/prado/form.js b/framework/Web/Javascripts/prado/form.js
index aec9395d..beea9248 100644
--- a/framework/Web/Javascripts/prado/form.js
+++ b/framework/Web/Javascripts/prado/form.js
@@ -129,7 +129,11 @@ Prado.PostBack = function(event,options)
 

 	$('PRADO_POSTBACK_TARGET').value = options['EventTarget'];

 	$('PRADO_POSTBACK_PARAMETER').value = options['EventParameter'];

-	if(options['StopEvent']) 

+	/**

+	 * Since google toolbar prevents browser default action,

+	 * we will always disable default client-side browser action

+	 */

+	/*if(options['StopEvent']) */

 		Event.stop(event);

 	Event.fireEvent(form,"submit");

 }