From 3531d977bde08697d8096f456fcde92a34e5d856 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Fri, 28 Jan 2005 15:43:22 +0000 Subject: [PATCH] Bug 232548 Element Properties should remove the properties with empty values patch by f.qu@laposte.net r=db48x sr=neil also rolling in a change from Bug 240947 use content instead of _content per neil w/ approval from mconnor git-svn-id: svn://10.0.0.236/trunk@168439 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/base/content/metaData.js | 24 +++++++++++-------- .../browser/resources/content/metadata.js | 24 +++++++++++-------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/mozilla/browser/base/content/metaData.js b/mozilla/browser/base/content/metaData.js index ca2517420ab..df3c021d5be 100644 --- a/mozilla/browser/base/content/metaData.js +++ b/mozilla/browser/base/content/metaData.js @@ -100,6 +100,11 @@ function showMetadataFor(elem) // Each of them could be at a different level in the tree, so they each // need their own boolean to tell us to stop looking. while (elem && elem.nodeType == Node.ELEMENT_NODE) { + htmllocalname = ""; + if (isHTMLElement(elem,"")) { + htmllocalname = elem.localName.toLowerCase(); + } + if (!onLink) checkForLink(elem, htmllocalname); if (!onInsDel) checkForInsDel(elem, htmllocalname); if (!onQuote) checkForQuote(elem, htmllocalname); @@ -108,11 +113,6 @@ function showMetadataFor(elem) if (!onLang) checkForLang(elem, htmllocalname); elem = elem.parentNode; - - htmllocalname = ""; - if (isHTMLElement(elem,"")) { - htmllocalname = elem.localName.toLowerCase(); - } } // Decide which sections to show @@ -245,15 +245,19 @@ function checkForLink(elem, htmllocalname) break; case "": case "_self": - if (elem.ownerDocument != elem.ownerDocument.defaultView._content.document) - setInfo("link-target", gMetadataBundle.getString("sameFrameText")); - else - setInfo("link-target", gMetadataBundle.getString("sameWindowText")); + if (elem.ownerDocument.defaultView) { + if (elem.ownerDocument != elem.ownerDocument.defaultView.content.document) + setInfo("link-target", gMetadataBundle.getString("sameFrameText")); + else + setInfo("link-target", gMetadataBundle.getString("sameWindowText")); + } else { + hideNode("link-target"); + } break; default: setInfo("link-target", "\"" + target + "\""); } - + onLink = true; } diff --git a/mozilla/xpfe/browser/resources/content/metadata.js b/mozilla/xpfe/browser/resources/content/metadata.js index 7d5bd251b70..a7bfce84436 100644 --- a/mozilla/xpfe/browser/resources/content/metadata.js +++ b/mozilla/xpfe/browser/resources/content/metadata.js @@ -105,6 +105,11 @@ function showMetadataFor(elem) // Each of them could be at a different level in the tree, so they each // need their own boolean to tell us to stop looking. while (elem && elem.nodeType == Node.ELEMENT_NODE) { + htmllocalname = ""; + if (isHTMLElement(elem,"")) { + htmllocalname = elem.localName.toLowerCase(); + } + if (!onLink) checkForLink(elem, htmllocalname); if (!onInsDel) checkForInsDel(elem, htmllocalname); if (!onQuote) checkForQuote(elem, htmllocalname); @@ -113,13 +118,8 @@ function showMetadataFor(elem) if (!onLang) checkForLang(elem, htmllocalname); elem = elem.parentNode; - - htmllocalname = ""; - if (isHTMLElement(elem,"")) { - htmllocalname = elem.localName.toLowerCase(); - } } - + // Decide which sections to show var onMisc = onTable || onTitle || onLang; if (!onMisc) hideNode("misc-sec"); @@ -252,10 +252,14 @@ function checkForLink(elem, htmllocalname) break; case "": case "_self": - if (elem.ownerDocument != elem.ownerDocument.defaultView.content.document) - setInfo("link-target", gMetadataBundle.getString("sameFrameText")); - else - setInfo("link-target", gMetadataBundle.getString("sameWindowText")); + if (elem.ownerDocument.defaultView) { + if (elem.ownerDocument != elem.ownerDocument.defaultView.content.document) + setInfo("link-target", gMetadataBundle.getString("sameFrameText")); + else + setInfo("link-target", gMetadataBundle.getString("sameWindowText")); + } else { + hideNode("link-target"); + } break; default: setInfo("link-target", "\"" + target + "\"");