зеркало из https://github.com/mozilla/pjs.git
Fix for XUL assertions when loading browser windows. sr=hyatt
This commit is contained in:
Родитель
f2a27deafb
Коммит
aaf58ddf27
|
@ -5810,11 +5810,10 @@ nsXULDocument::CheckBroadcasterHookup(nsXULDocument* aDocument,
|
|||
// Bail if there's no broadcasterID
|
||||
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || (broadcasterID.Length() == 0)) {
|
||||
// Try the command attribute next.
|
||||
nsAutoString commandID;
|
||||
rv = aElement->GetAttribute(kNameSpaceID_None, nsXULAtoms::command, commandID);
|
||||
rv = aElement->GetAttribute(kNameSpaceID_None, nsXULAtoms::command, broadcasterID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
if (rv == NS_CONTENT_ATTR_HAS_VALUE && commandID.Length() > 0) {
|
||||
if (rv == NS_CONTENT_ATTR_HAS_VALUE && broadcasterID.Length() > 0) {
|
||||
// We've got something in the command attribute. We only treat this as
|
||||
// a normal broadcaster if we are not a menuitem or a key.
|
||||
nsCOMPtr<nsIAtom> tag;
|
||||
|
|
Загрузка…
Ссылка в новой задаче