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

fix insert HR command for Midas (bug 183793; r=cmanske, sr=smfr)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@135415 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brade%netscape.com
2002-12-17 19:41:00 +00:00
parent 5a90ff2448
commit ea71542654
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4184,7 +4184,7 @@ static struct MidasCommand gMidasCommandTable[] = {
{ "increasefontsize", "cmd_increaseFont", "", PR_FALSE },
{ "decreasefontsize", "cmd_decreaseFont", "", PR_FALSE },
{ "fontsize", "cmd_fontSize", "", PR_FALSE },
{ "inserthorizontalrule", "cmd_hline", "", PR_TRUE },
{ "inserthorizontalrule", "cmd_insertHR", "", PR_TRUE },
{ "createlink", "cmd_insertLinkNoUI", "", PR_FALSE },
{ "insertimage", "cmd_insertImageNoUI", "", PR_FALSE },
{ "justifyleft", "cmd_align", "left", PR_TRUE },

23
mozilla/editor/composer/src/nsComposerCommands.cpp
View File

@@ -1315,6 +1315,22 @@ nsInsertTagCommand::IsCommandEnabled(const char * aCommandName,
NS_IMETHODIMP
nsInsertTagCommand::DoCommand(const char *aCmdName, nsISupports *refCon)
{
if (0 == nsCRT::strcmp(mTagName, "hr"))
{
nsCOMPtr<nsIHTMLEditor> editor = do_QueryInterface(refCon);
if (!editor)
return NS_ERROR_NOT_IMPLEMENTED;
nsCOMPtr<nsIDOMElement> domElem;
nsresult rv;
rv = editor->CreateElementWithDefaults(NS_ConvertASCIItoUCS2(mTagName),
getter_AddRefs(domElem));
if (NS_FAILED(rv))
return rv;
return editor->InsertElementAtSelection(domElem, PR_TRUE);
}
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -1323,9 +1339,14 @@ nsInsertTagCommand::DoCommandParams(const char *aCommandName,
nsICommandParams *aParams,
nsISupports *refCon)
{
NS_ENSURE_ARG_POINTER(aParams);
NS_ENSURE_ARG_POINTER(refCon);
// inserting an hr shouldn't have an parameters, just call DoCommand for that
if (0 == nsCRT::strcmp(mTagName, "hr"))
return DoCommand(aCommandName, refCon);
NS_ENSURE_ARG_POINTER(aParams);
nsCOMPtr<nsIHTMLEditor> editor = do_QueryInterface(refCon);
if (!editor)
return NS_ERROR_NOT_IMPLEMENTED;

1
mozilla/editor/composer/src/nsComposerController.cpp
View File

@@ -163,6 +163,7 @@ nsComposerController::RegisterHTMLEditorCommands(
NS_REGISTER_ONE_COMMAND(nsInsertHTMLCommand, "cmd_insertHTML");
NS_REGISTER_TAG_COMMAND(nsInsertTagCommand, "cmd_insertLinkNoUI", "a");
NS_REGISTER_TAG_COMMAND(nsInsertTagCommand, "cmd_insertImageNoUI", "img");
NS_REGISTER_TAG_COMMAND(nsInsertTagCommand, "cmd_insertHR", "hr");
return NS_OK;
}