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

bug 4382 - comments inside <option>

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@25677 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
1999-03-31 05:59:06 +00:00
parent a7847a5b6e
commit 445fa80194
2 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/content/html/content/src/nsHTMLOptionElement.cpp
View File

@@ -297,19 +297,28 @@ NS_IMETHODIMP
nsHTMLOptionElement::GetText(nsString& aText)
{
aText.SetLength(0);
nsIDOMNode* node = nsnull;
nsresult result = mInner.GetFirstChild(&node);
if ((NS_OK == result) && node) {
nsIDOMText* domText = nsnull;
result = node->QueryInterface(kIDOMTextIID, (void**)&domText);
if ((NS_OK == result) && domText) {
result = domText->GetData(aText);
aText.CompressWhitespace(PR_TRUE, PR_TRUE);
NS_RELEASE(domText);
}
NS_RELEASE(node);
PRInt32 numNodes;
nsresult rv = mInner.ChildCount(numNodes);
if (NS_FAILED(rv)) {
return rv;
}
return result;
for (PRInt32 i = 0; i < numNodes; i++) {
nsIContent* node;
rv = ChildAt(i, node);
if (NS_SUCCEEDED(rv)) {
nsIDOMText* domText = nsnull;
rv = node->QueryInterface(kIDOMTextIID, (void**)&domText);
if (NS_SUCCEEDED(rv) && domText) {
rv = domText->GetData(aText);
aText.CompressWhitespace(PR_TRUE, PR_TRUE);
NS_RELEASE(domText);
NS_RELEASE(node);
break;
}
NS_RELEASE(node);
}
}
return NS_OK;
}
NS_IMETHODIMP

33
mozilla/layout/html/content/src/nsHTMLOptionElement.cpp
View File

@@ -297,19 +297,28 @@ NS_IMETHODIMP
nsHTMLOptionElement::GetText(nsString& aText)
{
aText.SetLength(0);
nsIDOMNode* node = nsnull;
nsresult result = mInner.GetFirstChild(&node);
if ((NS_OK == result) && node) {
nsIDOMText* domText = nsnull;
result = node->QueryInterface(kIDOMTextIID, (void**)&domText);
if ((NS_OK == result) && domText) {
result = domText->GetData(aText);
aText.CompressWhitespace(PR_TRUE, PR_TRUE);
NS_RELEASE(domText);
}
NS_RELEASE(node);
PRInt32 numNodes;
nsresult rv = mInner.ChildCount(numNodes);
if (NS_FAILED(rv)) {
return rv;
}
return result;
for (PRInt32 i = 0; i < numNodes; i++) {
nsIContent* node;
rv = ChildAt(i, node);
if (NS_SUCCEEDED(rv)) {
nsIDOMText* domText = nsnull;
rv = node->QueryInterface(kIDOMTextIID, (void**)&domText);
if (NS_SUCCEEDED(rv) && domText) {
rv = domText->GetData(aText);
aText.CompressWhitespace(PR_TRUE, PR_TRUE);
NS_RELEASE(domText);
NS_RELEASE(node);
break;
}
NS_RELEASE(node);
}
}
return NS_OK;
}
NS_IMETHODIMP