Bug 663104 - Livemarks status menuitems are incorrectly updated. DONTBUILD

r=dietrich
This commit is contained in:
Marco Bonardo 2011-06-10 00:33:03 +02:00
parent e405b0e944
commit 9c20507618

View File

@ -466,17 +466,21 @@ PlacesViewBase.prototype = {
nodeAnnotationChanged:
function PVB_nodeAnnotationChanged(aPlacesNode, aAnno) {
// All livemarks have a feedURI, so use it as our indicator.
if (aAnno == PlacesUtils.LMANNO_FEEDURI) {
let elt = aPlacesNode._DOMElement;
if (!elt)
throw "aPlacesNode must have _DOMElement set";
let elt = aPlacesNode._DOMElement;
if (!elt)
throw "aPlacesNode must have _DOMElement set";
// All livemarks have a feedURI, so use it as our indicator of a livemark
// being modified.
if (aAnno == PlacesUtils.LMANNO_FEEDURI) {
let menu = elt.parentNode;
if (!menu.hasAttribute("livemark"))
menu.setAttribute("livemark", "true");
}
// Add or remove the livemark status menuitem.
if ([PlacesUtils.LMANNO_LOADING,
PlacesUtils.LMANNO_LOADFAILED].indexOf(aAnno) != -1) {
// Loading status changed, update the livemark status menuitem.
this._ensureLivemarkStatusMenuItem(elt);
}
},
@ -1169,10 +1173,17 @@ PlacesToolbar.prototype = {
if (aAnno == PlacesUtils.LMANNO_FEEDURI) {
elt.setAttribute("livemark", true);
}
return;
}
PlacesViewBase.prototype.nodeAnnotationChanged.apply(this, arguments);
if ([PlacesUtils.LMANNO_LOADING,
PlacesUtils.LMANNO_LOADFAILED].indexOf(aAnno) != -1) {
// Loading status changed, update the livemark status menuitem.
this._ensureLivemarkStatusMenuItem(elt.firstChild);
}
}
else {
// Node is in a submenu.
PlacesViewBase.prototype.nodeAnnotationChanged.apply(this, arguments);
}
},
nodeTitleChanged: function PT_nodeTitleChanged(aPlacesNode, aNewTitle) {