mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

implemented do and undo for CreateElement 

the test is INS key, it adds an HR
This commit is contained in:
buster%netscape.com 1999-01-08 01:30:53 +00:00
Родитель 1078080415
Коммит cdabceb9ac
5 изменённых файлов: 50 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
editor/base/CreateElementTxn.cpp
Просмотреть файл

@ -44,6 +44,7 @@ CreateElementTxn::~CreateElementTxn()
{ {
NS_IF_RELEASE(mDoc); NS_IF_RELEASE(mDoc);
NS_IF_RELEASE(mParent); NS_IF_RELEASE(mParent);
NS_IF_RELEASE(mNewNode);
} }
nsresult CreateElementTxn::Do(void) nsresult CreateElementTxn::Do(void)
@ -59,7 +60,8 @@ nsresult CreateElementTxn::Do(void)
if (CreateElementTxn::eAppend==mOffsetInParent) if (CreateElementTxn::eAppend==mOffsetInParent)
{ {
result = mParent->AppendChild(mNewNode, &resultNode); result = mParent->AppendChild(mNewNode, &resultNode);
//XXX: do we need to do anything with resultNode? release a refcount? if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode); // this object already holds a ref from CreateElement
} }
else else
{ {
@ -71,7 +73,8 @@ nsresult CreateElementTxn::Do(void)
if ((NS_SUCCEEDED(result)) && (nsnull!=mRefNode)) if ((NS_SUCCEEDED(result)) && (nsnull!=mRefNode))
{ {
result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode); result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode);
//XXX: do we need to do anything with resultNode? release a refcount? if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode); // this object already holds a ref from CreateElement
} }
} }
} }
@ -81,13 +84,20 @@ nsresult CreateElementTxn::Do(void)
nsresult CreateElementTxn::Undo(void) nsresult CreateElementTxn::Undo(void)
{ {
return NS_OK;//(mParent->InsertData(mOffset, mDeletedText)); nsIDOMNode *resultNode=nsnull;
nsresult result = mParent->RemoveChild(mNewNode, &resultNode);
if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode);
return result;
} }
nsresult CreateElementTxn::Redo(void) nsresult CreateElementTxn::Redo(void)
{ {
nsIDOMNode *resultNode=nsnull; nsIDOMNode *resultNode=nsnull;
return (mParent->InsertBefore(mNewNode, mRefNode, &resultNode)); nsresult result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode);
if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode);
return result;
} }
nsresult CreateElementTxn::GetIsTransient(PRBool *aIsTransient) nsresult CreateElementTxn::GetIsTransient(PRBool *aIsTransient)

7
editor/base/editorInterfaces.cpp
Просмотреть файл

@ -294,7 +294,7 @@ nsEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aProces
nsString attribute("src"); nsString attribute("src");
nsString value("resource:/res/samples/raptor.jpg"); nsString value("resource:/res/samples/raptor.jpg");
nsString imgTag("IMG"); nsString imgTag("HR");
nsString bodyTag("BODY"); nsString bodyTag("BODY");
nsCOMPtr<nsIDOMNode> currentNode; nsCOMPtr<nsIDOMNode> currentNode;
result = mEditor->GetFirstNodeOfType(nsnull, bodyTag, getter_AddRefs(currentNode)); result = mEditor->GetFirstNodeOfType(nsnull, bodyTag, getter_AddRefs(currentNode));
@ -309,8 +309,8 @@ nsEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aProces
mEditor->ExecuteTransaction(txn); mEditor->ExecuteTransaction(txn);
} }
} }
/*
/* for building a composite transaction */ //for building a composite transaction...
nsCOMPtr<nsIDOMElement> element; nsCOMPtr<nsIDOMElement> element;
if (NS_SUCCEEDED(mEditor->GetFirstNodeOfType(nsnull, imgTag, getter_AddRefs(currentNode)))) if (NS_SUCCEEDED(mEditor->GetFirstNodeOfType(nsnull, imgTag, getter_AddRefs(currentNode))))
{ {
@ -321,6 +321,7 @@ nsEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aProces
mEditor->ExecuteTransaction(txn); mEditor->ExecuteTransaction(txn);
} }
} }
*/
} }
aProcessed=PR_TRUE; aProcessed=PR_TRUE;
break; break;

18
editor/core/CreateElementTxn.cpp
Просмотреть файл

@ -44,6 +44,7 @@ CreateElementTxn::~CreateElementTxn()
{ {
NS_IF_RELEASE(mDoc); NS_IF_RELEASE(mDoc);
NS_IF_RELEASE(mParent); NS_IF_RELEASE(mParent);
NS_IF_RELEASE(mNewNode);
} }
nsresult CreateElementTxn::Do(void) nsresult CreateElementTxn::Do(void)
@ -59,7 +60,8 @@ nsresult CreateElementTxn::Do(void)
if (CreateElementTxn::eAppend==mOffsetInParent) if (CreateElementTxn::eAppend==mOffsetInParent)
{ {
result = mParent->AppendChild(mNewNode, &resultNode); result = mParent->AppendChild(mNewNode, &resultNode);
//XXX: do we need to do anything with resultNode? release a refcount? if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode); // this object already holds a ref from CreateElement
} }
else else
{ {
@ -71,7 +73,8 @@ nsresult CreateElementTxn::Do(void)
if ((NS_SUCCEEDED(result)) && (nsnull!=mRefNode)) if ((NS_SUCCEEDED(result)) && (nsnull!=mRefNode))
{ {
result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode); result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode);
//XXX: do we need to do anything with resultNode? release a refcount? if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode); // this object already holds a ref from CreateElement
} }
} }
} }
@ -81,13 +84,20 @@ nsresult CreateElementTxn::Do(void)
nsresult CreateElementTxn::Undo(void) nsresult CreateElementTxn::Undo(void)
{ {
return NS_OK;//(mParent->InsertData(mOffset, mDeletedText)); nsIDOMNode *resultNode=nsnull;
nsresult result = mParent->RemoveChild(mNewNode, &resultNode);
if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode);
return result;
} }
nsresult CreateElementTxn::Redo(void) nsresult CreateElementTxn::Redo(void)
{ {
nsIDOMNode *resultNode=nsnull; nsIDOMNode *resultNode=nsnull;
return (mParent->InsertBefore(mNewNode, mRefNode, &resultNode)); nsresult result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode);
if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode);
return result;
} }
nsresult CreateElementTxn::GetIsTransient(PRBool *aIsTransient) nsresult CreateElementTxn::GetIsTransient(PRBool *aIsTransient)

7
editor/core/editorInterfaces.cpp
Просмотреть файл

@ -294,7 +294,7 @@ nsEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aProces
nsString attribute("src"); nsString attribute("src");
nsString value("resource:/res/samples/raptor.jpg"); nsString value("resource:/res/samples/raptor.jpg");
nsString imgTag("IMG"); nsString imgTag("HR");
nsString bodyTag("BODY"); nsString bodyTag("BODY");
nsCOMPtr<nsIDOMNode> currentNode; nsCOMPtr<nsIDOMNode> currentNode;
result = mEditor->GetFirstNodeOfType(nsnull, bodyTag, getter_AddRefs(currentNode)); result = mEditor->GetFirstNodeOfType(nsnull, bodyTag, getter_AddRefs(currentNode));
@ -309,8 +309,8 @@ nsEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aProces
mEditor->ExecuteTransaction(txn); mEditor->ExecuteTransaction(txn);
} }
} }
/*
/* for building a composite transaction */ //for building a composite transaction...
nsCOMPtr<nsIDOMElement> element; nsCOMPtr<nsIDOMElement> element;
if (NS_SUCCEEDED(mEditor->GetFirstNodeOfType(nsnull, imgTag, getter_AddRefs(currentNode)))) if (NS_SUCCEEDED(mEditor->GetFirstNodeOfType(nsnull, imgTag, getter_AddRefs(currentNode))))
{ {
@ -321,6 +321,7 @@ nsEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aProces
mEditor->ExecuteTransaction(txn); mEditor->ExecuteTransaction(txn);
} }
} }
*/
} }
aProcessed=PR_TRUE; aProcessed=PR_TRUE;
break; break;

18
editor/libeditor/base/CreateElementTxn.cpp
Просмотреть файл

@ -44,6 +44,7 @@ CreateElementTxn::~CreateElementTxn()
{ {
NS_IF_RELEASE(mDoc); NS_IF_RELEASE(mDoc);
NS_IF_RELEASE(mParent); NS_IF_RELEASE(mParent);
NS_IF_RELEASE(mNewNode);
} }
nsresult CreateElementTxn::Do(void) nsresult CreateElementTxn::Do(void)
@ -59,7 +60,8 @@ nsresult CreateElementTxn::Do(void)
if (CreateElementTxn::eAppend==mOffsetInParent) if (CreateElementTxn::eAppend==mOffsetInParent)
{ {
result = mParent->AppendChild(mNewNode, &resultNode); result = mParent->AppendChild(mNewNode, &resultNode);
//XXX: do we need to do anything with resultNode? release a refcount? if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode); // this object already holds a ref from CreateElement
} }
else else
{ {
@ -71,7 +73,8 @@ nsresult CreateElementTxn::Do(void)
if ((NS_SUCCEEDED(result)) && (nsnull!=mRefNode)) if ((NS_SUCCEEDED(result)) && (nsnull!=mRefNode))
{ {
result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode); result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode);
//XXX: do we need to do anything with resultNode? release a refcount? if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode); // this object already holds a ref from CreateElement
} }
} }
} }
@ -81,13 +84,20 @@ nsresult CreateElementTxn::Do(void)
nsresult CreateElementTxn::Undo(void) nsresult CreateElementTxn::Undo(void)
{ {
return NS_OK;//(mParent->InsertData(mOffset, mDeletedText)); nsIDOMNode *resultNode=nsnull;
nsresult result = mParent->RemoveChild(mNewNode, &resultNode);
if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode);
return result;
} }
nsresult CreateElementTxn::Redo(void) nsresult CreateElementTxn::Redo(void)
{ {
nsIDOMNode *resultNode=nsnull; nsIDOMNode *resultNode=nsnull;
return (mParent->InsertBefore(mNewNode, mRefNode, &resultNode)); nsresult result = mParent->InsertBefore(mNewNode, mRefNode, &resultNode);
if ((NS_SUCCEEDED(result)) && (nsnull!=resultNode))
NS_RELEASE(resultNode);
return result;
} }
nsresult CreateElementTxn::GetIsTransient(PRBool *aIsTransient) nsresult CreateElementTxn::GetIsTransient(PRBool *aIsTransient)