From 24928e712a6d23cd48709f11b984e13252463a34 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Mon, 11 Jun 2001 22:05:52 +0000 Subject: [PATCH] Fix bug 77110. Make us treat wrap="physical" like NS 4.x and IE do, not as it was originally (in NS 2.x) intended. r=timeless, sr=attinasi, a=blizzard --- layout/forms/nsFormControlHelper.cpp | 10 ++++++---- layout/html/forms/src/nsFormControlHelper.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/layout/forms/nsFormControlHelper.cpp b/layout/forms/nsFormControlHelper.cpp index 9fe80bec0c5c..cdfde014b549 100644 --- a/layout/forms/nsFormControlHelper.cpp +++ b/layout/forms/nsFormControlHelper.cpp @@ -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; } diff --git a/layout/html/forms/src/nsFormControlHelper.cpp b/layout/html/forms/src/nsFormControlHelper.cpp index 9fe80bec0c5c..cdfde014b549 100644 --- a/layout/html/forms/src/nsFormControlHelper.cpp +++ b/layout/html/forms/src/nsFormControlHelper.cpp @@ -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; }