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

change the xbl-syntax <... inherits=".."> to <... xbl:inherits="..">

Browse Source 
b=119317 r=jkeiser sr=hyatt


git-svn-id: svn://10.0.0.236/trunk@115019 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sicking%bigfoot.com
2002-02-20 03:21:26 +00:00
parent 41c01215ce
commit e51968e5eb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
View File

@@ -1174,8 +1174,14 @@ nsXBLPrototypeBinding::ShouldBuildChildFrames(PRBool* aResult)
void
nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement)
{
nsresult rv;
nsAutoString inherits;
aElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::inherits, inherits);
rv = aElement->GetAttr(kNameSpaceID_XBL, nsXBLAtoms::inherits, inherits);
// XXX fallback to using "inherits" in the null namespace
// We shouldn't do this once bug 119317 is fully fixed
if (rv == NS_CONTENT_ATTR_NOT_THERE)
aElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::inherits, inherits);
if (!inherits.IsEmpty()) {
if (!mAttributeTable) {
mAttributeTable = new nsSupportsHashtable(4);
@@ -1239,7 +1245,7 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement)
// by the template only, and we don't need it anymore.
// XXXdwh Don't do this for XUL elements, since it faults them into heavyweight
// elements. Should nuke from the prototype instead.
// aElement->UnsetAttr(kNameSpaceID_None, nsXBLAtoms::inherits, PR_FALSE);
// aElement->UnsetAttr(kNameSpaceID_XBL, nsXBLAtoms::inherits, PR_FALSE);
token = nsCRT::strtok( newStr, ", ", &newStr );
}