Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 147878 - defer submission until onSubmit returns so we can

Browse Source 
chose to submit name/value or the triggering element if the return is true.
r= jkeiser sr= jst


git-svn-id: svn://10.0.0.236/trunk@134731 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alexsavulov%netscape.com 2002-12-03 23:06:34 +00:00
parent 2528bfde89
commit a2d6b2fcc9
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mozilla/content/html/content/src/nsHTMLFormElement.cpp
View File

@ -120,7 +120,7 @@ public:
mGeneratingSubmit(PR_FALSE), mGeneratingSubmit(PR_FALSE),
mGeneratingReset(PR_FALSE), mGeneratingReset(PR_FALSE),
mIsSubmitting(PR_FALSE), mIsSubmitting(PR_FALSE),
mInSubmitClick(PR_FALSE), mDeferSubmission(PR_FALSE),
mPendingSubmission(nsnull), mPendingSubmission(nsnull),
mSubmittingRequest(nsnull) { } mSubmittingRequest(nsnull) { }
@ -298,7 +298,7 @@ protected:
/** Whether we are submitting currently */ /** Whether we are submitting currently */
PRPackedBool mIsSubmitting; PRPackedBool mIsSubmitting;
/** Whether the submission was triggered by an Image or Submit*/ /** Whether the submission was triggered by an Image or Submit*/
PRPackedBool mInSubmitClick; PRPackedBool mDeferSubmission;
/** The pending submission object */ /** The pending submission object */
nsCOMPtr<nsIFormSubmission> mPendingSubmission; nsCOMPtr<nsIFormSubmission> mPendingSubmission;
@ -741,6 +741,11 @@ nsHTMLFormElement::HandleDOMEvent(nsIPresContext* aPresContext,
return NS_OK; return NS_OK;
} }
mGeneratingSubmit = PR_TRUE; mGeneratingSubmit = PR_TRUE;
// let the form know that it needs to defer the submission,
// that means that if there are scripted submissions, the
// latest one will be deferred until after the exit point of the handler.
mDeferSubmission = PR_TRUE;
} }
else if (aEvent->message == NS_FORM_RESET) { else if (aEvent->message == NS_FORM_RESET) {
if (mGeneratingReset) { if (mGeneratingReset) {
@ -749,23 +754,44 @@ nsHTMLFormElement::HandleDOMEvent(nsIPresContext* aPresContext,
mGeneratingReset = PR_TRUE; mGeneratingReset = PR_TRUE;
} }
nsresult rv = nsGenericHTMLContainerElement::HandleDOMEvent(aPresContext, nsresult rv = nsGenericHTMLContainerElement::HandleDOMEvent(aPresContext,
aEvent, aEvent,
aDOMEvent, aDOMEvent,
aFlags, aFlags,
aEventStatus); aEventStatus);
if (mDeferSubmission) {
// let the form know not to defer subsequent submissions
mDeferSubmission = PR_FALSE;
}
if (NS_SUCCEEDED(rv) && (*aEventStatus == nsEventStatus_eIgnore) && if (NS_SUCCEEDED(rv) &&
!(aFlags & NS_EVENT_FLAG_CAPTURE) && !(aFlags & NS_EVENT_FLAG_CAPTURE) &&
!(aFlags & NS_EVENT_FLAG_SYSTEM_EVENT)) { !(aFlags & NS_EVENT_FLAG_SYSTEM_EVENT)) {
switch (aEvent->message) { if (*aEventStatus == nsEventStatus_eIgnore) {
case NS_FORM_RESET: switch (aEvent->message) {
case NS_FORM_SUBMIT: case NS_FORM_RESET:
{ case NS_FORM_SUBMIT:
rv = DoSubmitOrReset(aPresContext, aEvent, aEvent->message); {
if (mPendingSubmission) {
// tell the form to forget a possible pending submission.
// the reason is that the script returned true (the event was
// ignored) so if there is a stored submission, it will miss
// the name/value of the submitting element, thus we need
// to forget it and the form element will build a new one
ForgetPendingSubmission();
}
rv = DoSubmitOrReset(aPresContext, aEvent, aEvent->message);
}
break;
} }
break; } else {
// tell the form to flush a possible pending submission.
// the reason is that the script returned false (the event was
// not ignored) so if there is a stored submission, it needs to
// be submitted immediatelly.
FlushPendingSubmission();
} }
} }
@ -850,8 +876,8 @@ nsHTMLFormElement::DoSubmit(nsIPresContext* aPresContext, nsEvent* aEvent)
// //
BuildSubmission(aPresContext, submission, aEvent); BuildSubmission(aPresContext, submission, aEvent);
if(mInSubmitClick) { if(mDeferSubmission) {
// we are in the onclick event handler so we have to // we are in an event handler, JS submitted so we have to
// defer this submission. let's remember it and return // defer this submission. let's remember it and return
// without submitting // without submitting
mPendingSubmission = submission; mPendingSubmission = submission;
@ -1310,14 +1336,14 @@ nsHTMLFormElement::ResolveName(const nsAString& aName,
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLFormElement::OnSubmitClickBegin() nsHTMLFormElement::OnSubmitClickBegin()
{ {
mInSubmitClick = PR_TRUE; mDeferSubmission = PR_TRUE;
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLFormElement::OnSubmitClickEnd() nsHTMLFormElement::OnSubmitClickEnd()
{ {
mInSubmitClick = PR_FALSE; mDeferSubmission = PR_FALSE;
return NS_OK; return NS_OK;
} }