Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the default "submit"

Browse Source 
Bug 59035 r=kmcclusk sr=attinasi
This commit is contained in:
rods%netscape.com 2001-09-19 13:00:23 +00:00
parent d452604ec7
commit 07983f1cca
4 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@ -319,26 +319,9 @@ nsHTMLButtonControlFrame::IsReset(PRInt32 type)
}
PRBool
nsHTMLButtonControlFrame::IsSubmit(nsIPresContext* aPresContext, PRInt32 type)
nsHTMLButtonControlFrame::IsSubmit(PRInt32 type)
{
nsCompatibility mode;
nsFormControlHelper::GetFormCompatibilityMode(aPresContext, mode);
if (eCompatibility_Standard == mode && mContent != nsnull) {
// The default type for a html4 button is NS_FORM_BUTTON_BUTTON,
// but that does not mean that the type was actually set to "button"
// so we need to check here to see if a type was actually set
// and oif it wasn't explicitly then we we allow to be a submit
if (NS_FORM_BUTTON_BUTTON == type) {
nsAutoString type;
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, type)) {
return PR_FALSE;
} else {
return PR_TRUE;
}
}
}
if (NS_FORM_BUTTON_SUBMIT == type || NS_FORM_INPUT_SUBMIT == type) {
if (NS_FORM_BUTTON_SUBMIT == type) {
return PR_TRUE;
} else {
return PR_FALSE;
@ -358,7 +341,7 @@ nsHTMLButtonControlFrame::MouseClicked(nsIPresContext* aPresContext)
nsFormControlHelper::DoManualSubmitOrReset(aPresContext, nsnull, mFormFrame,
this, PR_FALSE, PR_FALSE);
}
else if (IsSubmit(aPresContext, type) == PR_TRUE) {
else if (IsSubmit(type) == PR_TRUE) {
// do Submit & Frame processing of event
nsFormControlHelper::DoManualSubmitOrReset(aPresContext, nsnull, mFormFrame,
this, PR_TRUE, PR_FALSE);

2
layout/forms/nsHTMLButtonControlFrame.h
View File

@ -149,7 +149,7 @@ public:
protected:
virtual PRBool IsReset(PRInt32 type);
virtual PRBool IsSubmit(nsIPresContext* aPresContext, PRInt32 type);
virtual PRBool IsSubmit(PRInt32 type);
NS_IMETHOD AddComputedBorderPaddingToDesiredSize(nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aSuggestedReflowState);
NS_IMETHOD_(nsrefcnt) AddRef(void);

23
layout/html/forms/src/nsHTMLButtonControlFrame.cpp
View File

@ -319,26 +319,9 @@ nsHTMLButtonControlFrame::IsReset(PRInt32 type)
}
PRBool
nsHTMLButtonControlFrame::IsSubmit(nsIPresContext* aPresContext, PRInt32 type)
nsHTMLButtonControlFrame::IsSubmit(PRInt32 type)
{
nsCompatibility mode;
nsFormControlHelper::GetFormCompatibilityMode(aPresContext, mode);
if (eCompatibility_Standard == mode && mContent != nsnull) {
// The default type for a html4 button is NS_FORM_BUTTON_BUTTON,
// but that does not mean that the type was actually set to "button"
// so we need to check here to see if a type was actually set
// and oif it wasn't explicitly then we we allow to be a submit
if (NS_FORM_BUTTON_BUTTON == type) {
nsAutoString type;
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttr(kNameSpaceID_HTML, nsHTMLAtoms::type, type)) {
return PR_FALSE;
} else {
return PR_TRUE;
}
}
}
if (NS_FORM_BUTTON_SUBMIT == type || NS_FORM_INPUT_SUBMIT == type) {
if (NS_FORM_BUTTON_SUBMIT == type) {
return PR_TRUE;
} else {
return PR_FALSE;
@ -358,7 +341,7 @@ nsHTMLButtonControlFrame::MouseClicked(nsIPresContext* aPresContext)
nsFormControlHelper::DoManualSubmitOrReset(aPresContext, nsnull, mFormFrame,
this, PR_FALSE, PR_FALSE);
}
else if (IsSubmit(aPresContext, type) == PR_TRUE) {
else if (IsSubmit(type) == PR_TRUE) {
// do Submit & Frame processing of event
nsFormControlHelper::DoManualSubmitOrReset(aPresContext, nsnull, mFormFrame,
this, PR_TRUE, PR_FALSE);

2
layout/html/forms/src/nsHTMLButtonControlFrame.h
View File

@ -149,7 +149,7 @@ public:
protected:
virtual PRBool IsReset(PRInt32 type);
virtual PRBool IsSubmit(nsIPresContext* aPresContext, PRInt32 type);
virtual PRBool IsSubmit(PRInt32 type);
NS_IMETHOD AddComputedBorderPaddingToDesiredSize(nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aSuggestedReflowState);
NS_IMETHOD_(nsrefcnt) AddRef(void);