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

If a sort isn't initially imposed, just append new nodes onto end of container's child list.

This commit is contained in:
rjc%netscape.com 1999-04-20 22:14:38 +00:00
Родитель 5ef183af6c
Коммит d51ded93c9
2 изменённых файлов: 90 добавлений и 86 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
content/xul/templates/src/nsXULSortService.cpp
Просмотреть файл

@ -985,7 +985,9 @@ XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node)
sortInfo.kTreeCellAtom = kTreeCellAtom; sortInfo.kTreeCellAtom = kTreeCellAtom;
sortInfo.kNameSpaceID_XUL = kNameSpaceID_XUL; sortInfo.kNameSpaceID_XUL = kNameSpaceID_XUL;
if (NS_FAILED(rv = GetSortColumnInfo(treeNode, sortResource, sortDirection))) return(rv); PRBool childAdded = PR_FALSE;
if (NS_SUCCEEDED(rv = GetSortColumnInfo(treeNode, sortResource, sortDirection)))
{
char *uri = sortResource.ToNewCString(); char *uri = sortResource.ToNewCString();
if (uri) if (uri)
{ {
@ -1007,12 +1009,11 @@ XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node)
sortInfo.descendingSort = PR_TRUE; sortInfo.descendingSort = PR_TRUE;
else else
sortInfo.descendingSort = PR_FALSE; sortInfo.descendingSort = PR_FALSE;
// crap
// figure out where to insert the node when a sort order is being imposed // figure out where to insert the node when a sort order is being imposed
PRInt32 childIndex = 0, numChildren = 0, nameSpaceID; PRInt32 childIndex = 0, numChildren = 0, nameSpaceID;
nsCOMPtr<nsIContent> child; nsCOMPtr<nsIContent> child;
nsresult rv; nsresult rv;
PRBool childAdded = PR_FALSE;
if (NS_FAILED(rv = container->ChildCount(numChildren))) return(rv); if (NS_FAILED(rv = container->ChildCount(numChildren))) return(rv);
for (childIndex=0; childIndex<numChildren; childIndex++) for (childIndex=0; childIndex<numChildren; childIndex++)
@ -1031,11 +1032,12 @@ XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node)
} }
} }
} }
}
}
if (childAdded == PR_FALSE) if (childAdded == PR_FALSE)
{ {
container->AppendChildTo(node, PR_TRUE); container->AppendChildTo(node, PR_TRUE);
} }
}
return(NS_OK); return(NS_OK);
} }

10
rdf/content/src/nsXULSortService.cpp
Просмотреть файл

@ -985,7 +985,9 @@ XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node)
sortInfo.kTreeCellAtom = kTreeCellAtom; sortInfo.kTreeCellAtom = kTreeCellAtom;
sortInfo.kNameSpaceID_XUL = kNameSpaceID_XUL; sortInfo.kNameSpaceID_XUL = kNameSpaceID_XUL;
if (NS_FAILED(rv = GetSortColumnInfo(treeNode, sortResource, sortDirection))) return(rv); PRBool childAdded = PR_FALSE;
if (NS_SUCCEEDED(rv = GetSortColumnInfo(treeNode, sortResource, sortDirection)))
{
char *uri = sortResource.ToNewCString(); char *uri = sortResource.ToNewCString();
if (uri) if (uri)
{ {
@ -1007,12 +1009,11 @@ XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node)
sortInfo.descendingSort = PR_TRUE; sortInfo.descendingSort = PR_TRUE;
else else
sortInfo.descendingSort = PR_FALSE; sortInfo.descendingSort = PR_FALSE;
// crap
// figure out where to insert the node when a sort order is being imposed // figure out where to insert the node when a sort order is being imposed
PRInt32 childIndex = 0, numChildren = 0, nameSpaceID; PRInt32 childIndex = 0, numChildren = 0, nameSpaceID;
nsCOMPtr<nsIContent> child; nsCOMPtr<nsIContent> child;
nsresult rv; nsresult rv;
PRBool childAdded = PR_FALSE;
if (NS_FAILED(rv = container->ChildCount(numChildren))) return(rv); if (NS_FAILED(rv = container->ChildCount(numChildren))) return(rv);
for (childIndex=0; childIndex<numChildren; childIndex++) for (childIndex=0; childIndex<numChildren; childIndex++)
@ -1031,11 +1032,12 @@ XULSortServiceImpl::InsertContainerNode(nsIContent *container, nsIContent *node)
} }
} }
} }
}
}
if (childAdded == PR_FALSE) if (childAdded == PR_FALSE)
{ {
container->AppendChildTo(node, PR_TRUE); container->AppendChildTo(node, PR_TRUE);
} }
}
return(NS_OK); return(NS_OK);
} }