gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-29 01:42:37 +01:00
Code Issues Projects Releases Wiki Activity

Replace expression closures (methods).

Browse Source 
Expression closures are to be axed. See https://bugzil.la/1083458.
This commit is contained in:
Doug Kearns
2015-07-23 01:55:32 +10:00
parent c035aa936b
commit 77d59cdfd1
45 changed files with 1595 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/modules/bookmarkcache.jsm
View File

@@ -61,7 +61,7 @@ update(Bookmark.prototype, {
}
});
Bookmark.prototype.members.uri = Bookmark.prototype.members.url;
Bookmark.setter = function (key, func) this.prototype.__defineSetter__(key, func);
Bookmark.setter = function (key, func) { return this.prototype.__defineSetter__(key, func); };
Bookmark.setter("url", function (val) { this.uri = isString(val) ? newURI(val) : val; });
Bookmark.setter("title", function (val) { services.bookmarks.setItemTitle(this.id, val); });
Bookmark.setter("post", function (val) { bookmarkcache.annotate(this.id, bookmarkcache.POST, val); });
@@ -87,7 +87,9 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
services.bookmarks.removeObserver(this);
},
"@@iterator": function () values(bookmarkcache.bookmarks),
"@@iterator": function () {
return values(bookmarkcache.bookmarks);
},
bookmarks: Class.Memoize(function () { return this.load(); }),
@@ -137,11 +139,13 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
return null;
},
readBookmark: function readBookmark(id) ({
itemId: id,
uri: services.bookmarks.getBookmarkURI(id).spec,
title: services.bookmarks.getItemTitle(id)
}),
readBookmark: function readBookmark(id) {
return {
itemId: id,
uri: services.bookmarks.getBookmarkURI(id).spec,
title: services.bookmarks.getItemTitle(id)
};
},
findRoot: function findRoot(id) {
do {
@@ -151,7 +155,9 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
return root;
},
isBookmark: function (id) this.rootFolders.indexOf(this.findRoot(id)) >= 0,
isBookmark: function (id) {
return this.rootFolders.indexOf(this.findRoot(id)) >= 0;
},
/**
* Returns true if the given URL is bookmarked and that bookmark is
@@ -254,9 +260,10 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
}, {
DEFAULT_FAVICON: "chrome://mozapps/skin/places/defaultFavicon.png",
getAnnotation: function getAnnotation(item, anno)
services.annotation.itemHasAnnotation(item, anno) ?
services.annotation.getItemAnnotation(item, anno) : null,
getAnnotation: function getAnnotation(item, anno) {
return services.annotation.itemHasAnnotation(item, anno) ?
services.annotation.getItemAnnotation(item, anno) : null;
},
getFavicon: function getFavicon(uri) {
try {