summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorxue <>2006-06-12 01:21:00 +0000
committerxue <>2006-06-12 01:21:00 +0000
commit184a867dd08a98cce84466ad32d94796adaf3de9 (patch)
tree51382280e56202a5d1c7794da783410cebd4353b /framework
parent2da825c6f1dd3726bcc866082f6d28dcc29a0c5a (diff)
Fixed #191.
Diffstat (limited to 'framework')
-rw-r--r--framework/Web/Javascripts/js/prado.js3
-rw-r--r--framework/Web/Javascripts/prado/form.js6
2 files changed, 6 insertions, 3 deletions
diff --git a/framework/Web/Javascripts/js/prado.js b/framework/Web/Javascripts/js/prado.js
index 0946e192..1ec69786 100644
--- a/framework/Web/Javascripts/js/prado.js
+++ b/framework/Web/Javascripts/js/prado.js
@@ -243,8 +243,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");
}