Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 77110. Make us treat wrap="physical" like NS 4.x and IE do, not

Browse Source 
as it was originally (in NS 2.x) intended.  r=timeless, sr=attinasi,
a=blizzard
This commit is contained in:
bzbarsky%mit.edu 2001-06-11 22:05:52 +00:00
parent 6d86bed09e
commit 24928e712a
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/forms/nsFormControlHelper.cpp
View File

@ -76,7 +76,9 @@ static NS_DEFINE_IID(kViewCID, NS_VIEW_CID);
#define kTextControl_Wrap_Soft "SOFT"
#define kTextControl_Wrap_Virtual "VIRTUAL" // "virtual" is a synonym for "soft"
#define kTextControl_Wrap_Hard "HARD"
#define kTextControl_Wrap_Physical "PHYSICAL" // "physical" is a synonym for "hard"
#define kTextControl_Wrap_Physical "PHYSICAL" // "physical" should be a synonym
// for "hard" but NS 4.x and IE make
// it a synonym for "soft"
#define kTextControl_Wrap_Off "OFF"
@ -206,8 +208,7 @@ nsFormControlHelper::GetWrapPropertyEnum(nsIContent * aContent, nsHTMLTextWrap&
nsAutoString wrapHard; wrapHard.AssignWithConversion(kTextControl_Wrap_Hard);
nsAutoString wrapPhysical; wrapPhysical.AssignWithConversion(kTextControl_Wrap_Physical);
if (wrap.EqualsIgnoreCase(wrapHard) ||
wrap.EqualsIgnoreCase(wrapPhysical)) {
if (wrap.EqualsIgnoreCase(wrapHard)) {
aWrapProp = eHTMLTextWrap_Hard;
return result;
}
@ -215,7 +216,8 @@ nsFormControlHelper::GetWrapPropertyEnum(nsIContent * aContent, nsHTMLTextWrap&
nsAutoString wrapSoft; wrapSoft.AssignWithConversion(kTextControl_Wrap_Soft);
nsAutoString wrapVirtual; wrapVirtual.AssignWithConversion(kTextControl_Wrap_Virtual);
if (wrap.EqualsIgnoreCase(wrapSoft) ||
wrap.EqualsIgnoreCase(wrapVirtual)) {
wrap.EqualsIgnoreCase(wrapVirtual) ||
wrap.EqualsIgnoreCase(wrapPhysical)) {
aWrapProp = eHTMLTextWrap_Soft;
return result;
}

10
layout/html/forms/src/nsFormControlHelper.cpp
View File

@ -76,7 +76,9 @@ static NS_DEFINE_IID(kViewCID, NS_VIEW_CID);
#define kTextControl_Wrap_Soft "SOFT"
#define kTextControl_Wrap_Virtual "VIRTUAL" // "virtual" is a synonym for "soft"
#define kTextControl_Wrap_Hard "HARD"
#define kTextControl_Wrap_Physical "PHYSICAL" // "physical" is a synonym for "hard"
#define kTextControl_Wrap_Physical "PHYSICAL" // "physical" should be a synonym
// for "hard" but NS 4.x and IE make
// it a synonym for "soft"
#define kTextControl_Wrap_Off "OFF"
@ -206,8 +208,7 @@ nsFormControlHelper::GetWrapPropertyEnum(nsIContent * aContent, nsHTMLTextWrap&
nsAutoString wrapHard; wrapHard.AssignWithConversion(kTextControl_Wrap_Hard);
nsAutoString wrapPhysical; wrapPhysical.AssignWithConversion(kTextControl_Wrap_Physical);
if (wrap.EqualsIgnoreCase(wrapHard) ||
wrap.EqualsIgnoreCase(wrapPhysical)) {
if (wrap.EqualsIgnoreCase(wrapHard)) {
aWrapProp = eHTMLTextWrap_Hard;
return result;
}
@ -215,7 +216,8 @@ nsFormControlHelper::GetWrapPropertyEnum(nsIContent * aContent, nsHTMLTextWrap&
nsAutoString wrapSoft; wrapSoft.AssignWithConversion(kTextControl_Wrap_Soft);
nsAutoString wrapVirtual; wrapVirtual.AssignWithConversion(kTextControl_Wrap_Virtual);
if (wrap.EqualsIgnoreCase(wrapSoft) ||
wrap.EqualsIgnoreCase(wrapVirtual)) {
wrap.EqualsIgnoreCase(wrapVirtual) ||
wrap.EqualsIgnoreCase(wrapPhysical)) {
aWrapProp = eHTMLTextWrap_Soft;
return result;
}