Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-13 18:27:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 742714 - Remove LMANNO_EXPIRATION, LMANNO_LOADFAILED, and LMANNO_LOADING. r=mak

Browse Source 
--HG--
extra : rebase_source : df909400325dc84602964b9d2073cdacb06eeffb
This commit is contained in:
Paolo Amadini 2012-04-12 12:28:12 +02:00
parent 0bfd44989d
commit 692998f4d8
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/components/places/PlacesUtils.jsm
View File

@ -133,9 +133,6 @@ var PlacesUtils = {
EXCLUDE_FROM_BACKUP_ANNO: "places/excludeFromBackup",
LMANNO_FEEDURI: "livemark/feedURI",
LMANNO_SITEURI: "livemark/siteURI",
LMANNO_EXPIRATION: "livemark/expiration",
LMANNO_LOADFAILED: "livemark/loadfailed",
LMANNO_LOADING: "livemark/loading",
POST_DATA_ANNO: "bookmarkProperties/POSTData",
READ_ONLY_ANNO: "placesInternal/READ_ONLY",
@ -1387,10 +1384,6 @@ var PlacesUtils = {
case this.LMANNO_SITEURI:
siteURI = this._uri(aAnno.value);
return false;
case this.LMANNO_EXPIRATION:
case this.LMANNO_LOADING:
case this.LMANNO_LOADFAILED:
return false;
default:
return true;
}
@ -2703,10 +2696,7 @@ function PlacesRemoveLivemarkTransaction(aLivemarkId)
let annos = PlacesUtils.getAnnotationsForItem(this.item.id);
// Exclude livemark service annotations, those will be recreated automatically
let annosToExclude = [PlacesUtils.LMANNO_FEEDURI,
PlacesUtils.LMANNO_SITEURI,
PlacesUtils.LMANNO_EXPIRATION,
PlacesUtils.LMANNO_LOADFAILED,
PlacesUtils.LMANNO_LOADING];
PlacesUtils.LMANNO_SITEURI];
this.item.annotations = annos.filter(function(aValue, aIndex, aArray) {
return annosToExclude.indexOf(aValue.name) == -1;
});