Bug 492804 - remove hasAnno check for bookmark description, r=mak77
--- a/browser/components/places/content/treeView.js
+++ b/browser/components/places/content/treeView.js
@@ -1179,19 +1179,23 @@ PlacesTreeView.prototype = {
return "";
case this.COLUMN_TYPE_VISITCOUNT:
return node.accessCount;
case this.COLUMN_TYPE_KEYWORD:
if (PlacesUtils.nodeIsBookmark(node))
return PlacesUtils.bookmarks.getKeywordForBookmark(node.itemId);
return "";
case this.COLUMN_TYPE_DESCRIPTION:
- const annos = PlacesUtils.annotations;
- if (annos.itemHasAnnotation(node.itemId, DESCRIPTION_ANNO))
- return annos.getItemAnnotation(node.itemId, DESCRIPTION_ANNO)
+ if (node.itemId != -1) {
+ try {
+ return PlacesUtils.annotations.
+ getItemAnnotation(node.itemId, DESCRIPTION_ANNO);
+ }
+ catch (ex) { /* has no description */ }
+ }
return "";
case this.COLUMN_TYPE_DATEADDED:
if (node.dateAdded)
return this._convertPRTimeToString(node.dateAdded);
return "";
case this.COLUMN_TYPE_LASTMODIFIED:
if (node.lastModified)
return this._convertPRTimeToString(node.lastModified);