gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-11 23:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Add Bookmark{Change,Remove} autocommands. Fix tags arg of BookmarkAdd, but keyword will still need BookmarkChange.

Browse Source 
--HG--
extra : rebase_source : 2a3a37c3bf1743274ca875afbe110d85f70517d7
This commit is contained in:
Kris Maglione
2010-09-27 10:04:52 -04:00
parent 22594b6127
commit 3d5f29fa59
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/bookmarks.js
View File

@@ -12,8 +12,8 @@ const DEFAULT_FAVICON = "chrome://mozapps/skin/places/defaultFavicon.png";
const Bookmarks = Module("bookmarks", {
init: function () {
storage.addObserver("bookmark-cache", function (key, event, arg) {
if (event == "add")
autocommands.trigger("BookmarkAdd", arg);
if (["add", "change", "remove"].indexOf(event) >= 0)
autocommands.trigger("Bookmark" + event[0].toUpperCase() + event.substr(1), arg);
statusline.updateUrl();
}, window);
},
@@ -43,6 +43,10 @@ const Bookmarks = Module("bookmarks", {
break;
}
if (tags) {
PlacesUtils.tagging.untagURI(uri, null);
PlacesUtils.tagging.tagURI(uri, tags);
}
if (id == undefined)
id = services.get("bookmarks").insertBookmark(
services.get("bookmarks")[starOnly ? "unfiledBookmarksFolder" : "bookmarksMenuFolder"],
@@ -52,10 +56,6 @@ const Bookmarks = Module("bookmarks", {
if (keyword)
services.get("bookmarks").setKeywordForBookmark(id, keyword);
if (tags) {
PlacesUtils.tagging.untagURI(uri, null);
PlacesUtils.tagging.tagURI(uri, tags);
}
}
catch (e) {
dactyl.log(e, 0);

19
common/modules/bookmarkcache.jsm
View File

@@ -38,8 +38,13 @@ const BookmarkCache = Module("BookmarkCache", {
_deleteBookmark: function deleteBookmark(id) {
let length = this.bookmarks.length;
this.bookmarks = this.bookmarks.filter(function (item) item.id != id);
return this.bookmarks.length < length;
let result;
this.bookmarks = this.bookmarks.filter(function (item) {
if (item.id == id)
result = item;
return item.id != id;
});
return result;
},
_loadBookmark: function loadBookmark(node) {
@@ -126,8 +131,9 @@ const BookmarkCache = Module("BookmarkCache", {
}
},
onItemRemoved: function onItemRemoved(itemId, folder, index) {
if (this._deleteBookmark(itemId))
storage.fireEvent(name, "remove", itemId);
let result = this._deleteBookmark(itemId);
if (result)
storage.fireEvent(name, "remove", result);
},
onItemChanged: function onItemChanged(itemId, property, isAnnotation, value) {
if (isAnnotation)
@@ -136,9 +142,10 @@ const BookmarkCache = Module("BookmarkCache", {
if (bookmark) {
if (property == "tags")
value = tagging.getTagsForURI(util.newURI(bookmark.url), {});
if (property in bookmark)
if (property in bookmark) {
bookmark[property] = value;
storage.fireEvent(name, "change", itemId);
storage.fireEvent(name, "change", { __proto__: bookmark, changed: property });
}
}
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver])