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

Fix for bug 301490 (Rich text editor property useCSS changed meaning). r=brade, sr=brendan.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@178929 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org 2005-08-25 11:51:04 +00:00
parent 8cf400a00c
commit bcd5fc4014
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@ -3641,8 +3641,8 @@ static const struct MidasCommand gMidasCommandTable[] = {
{ "insertparagraph", "cmd_paragraphState", "p", PR_TRUE, PR_FALSE }, { "insertparagraph", "cmd_paragraphState", "p", PR_TRUE, PR_FALSE },
{ "formatblock", "cmd_paragraphState", "", PR_FALSE, PR_FALSE }, { "formatblock", "cmd_paragraphState", "", PR_FALSE, PR_FALSE },
{ "heading", "cmd_paragraphState", "", PR_FALSE, PR_FALSE }, { "heading", "cmd_paragraphState", "", PR_FALSE, PR_FALSE },
{ "useCSS", "cmd_setDocumentUseCSS", "", PR_FALSE, PR_TRUE }, { "styleWithCSS", "cmd_setDocumentUseCSS", "", PR_FALSE, PR_TRUE },
{ "readonly", "cmd_setDocumentReadOnly", "", PR_FALSE, PR_TRUE }, { "contentReadOnly", "cmd_setDocumentReadOnly", "", PR_FALSE, PR_TRUE },
{ "insertBrOnReturn", "cmd_insertBrOnReturn", "", PR_FALSE, PR_TRUE }, { "insertBrOnReturn", "cmd_insertBrOnReturn", "", PR_FALSE, PR_TRUE },
{ "enableObjectResizing", "cmd_enableObjectResizing", "", PR_FALSE, PR_TRUE }, { "enableObjectResizing", "cmd_enableObjectResizing", "", PR_FALSE, PR_TRUE },
{ "enableInlineTableEditing", "cmd_enableInlineTableEditing", "", PR_FALSE, PR_TRUE }, { "enableInlineTableEditing", "cmd_enableInlineTableEditing", "", PR_FALSE, PR_TRUE },
@ -3693,7 +3693,19 @@ nsHTMLDocument::ConvertToMidasInternalCommand(const nsAString & inCommandID,
PRBool& outIsBoolean, PRBool& outIsBoolean,
PRBool& outBooleanValue) PRBool& outBooleanValue)
{ {
NS_ConvertUCS2toUTF8 convertedCommandID(inCommandID); NS_ConvertUTF16toUTF8 convertedCommandID(inCommandID);
// Hack to support old boolean commands that were backwards (see bug 301490).
PRBool invertBool = PR_FALSE;
if (convertedCommandID.LowerCaseEqualsLiteral("usecss")) {
convertedCommandID.Assign("styleWithCSS");
invertBool = PR_TRUE;
}
else if (convertedCommandID.LowerCaseEqualsLiteral("readonly")) {
convertedCommandID.Assign("contentReadOnly");
invertBool = PR_TRUE;
}
PRUint32 i; PRUint32 i;
PRBool found = PR_FALSE; PRBool found = PR_FALSE;
for (i = 0; i < MidasCommandCount; ++i) { for (i = 0; i < MidasCommandCount; ++i) {
@ -3718,9 +3730,15 @@ nsHTMLDocument::ConvertToMidasInternalCommand(const nsAString & inCommandID,
// handle checking of param passed in // handle checking of param passed in
if (outIsBoolean) { if (outIsBoolean) {
// if this is a boolean value and it's not explicitly false // if this is a boolean value and it's not explicitly false
// (e.g. no value) we default to "true" // (e.g. no value) we default to "true". For old backwards commands
outBooleanValue = !inParam.LowerCaseEqualsLiteral("false"); // we invert the check (see bug 301490).
outParam.SetLength(0); if (invertBool) {
outBooleanValue = inParam.LowerCaseEqualsLiteral("false");
}
else {
outBooleanValue = !inParam.LowerCaseEqualsLiteral("false");
}
outParam.Truncate();
} }
else { else {
NS_ConvertUCS2toUTF8 convertedParam(inParam); NS_ConvertUCS2toUTF8 convertedParam(inParam);