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

Merge default.

Browse Source 
--HG--
branch : groups
This commit is contained in:
Kris Maglione
2011-02-05 16:24:14 -05:00
parent 5a00fb0c62 4d47bfe002
commit e5a829e9f6
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/bookmarks.js
View File

@@ -192,8 +192,8 @@ var Bookmarks = Module("bookmarks", {
let aliases = {};
return iter(services.browserSearch.getVisibleEngines({})).map(function ([, engine]) {
let alias = engine.alias;
if (!alias || !/^[a-z-]+$/.test(alias))
alias = engine.name.replace(/[^a-z_-]+/gi, "-").replace(/^-|-$/, "").toLowerCase();
if (!alias || !/^[a-z0-9-]+$/.test(alias))
alias = engine.name.replace(/[^a-z0-9]+/gi, "-").replace(/^-|-$/, "").toLowerCase();
if (!alias)
alias = "search"; // for search engines which we can't find a suitable alias
@@ -248,12 +248,6 @@ var Bookmarks = Module("bookmarks", {
return process(resp);
},
/**
* Returns an array of bookmark keyword objects.
* @deprecated
*/
getKeywords: function getKeywords() bookmarkcache.keywords,
/**
* Returns an array containing a search URL and POST data for the
* given search string. If *useDefsearch* is true, the string is
@@ -600,7 +594,7 @@ var Bookmarks = Module("bookmarks", {
completion.search = function search(context, noSuggest) {
let [, keyword, space, args] = context.filter.match(/^\s*(\S*)(\s*)(.*)$/);
let keywords = bookmarks.getKeywords();
let keywords = bookmarkcache.keywords;
let engines = bookmarks.searchEngines;
context.title = ["Search Keywords"];

8
common/content/buffer.js
View File

@@ -324,13 +324,13 @@ var Buffer = Module("buffer", {
if (win && uri) {
statusline.progress = win.dactylProgress;
let oldURI = webProgress.document.dactylURI;
if (webProgress.document.dactylLoadIdx === webProgress.loadedTransIndex
let oldURI = win.document.dactylURI;
if (win.document.dactylLoadIdx === webProgress.loadedTransIndex
|| !oldURI || uri.spec.replace(/#.*/, "") !== oldURI.replace(/#.*/, ""))
for (let frame in values(buffer.allFrames(win)))
frame.document.dactylFocusAllowed = false;
webProgress.document.dactylURI = uri.spec;
webProgress.document.dactylLoadIdx = webProgress.loadedTransIndex;
win.document.dactylURI = uri.spec;
win.document.dactylLoadIdx = webProgress.loadedTransIndex;
}
// Workaround for bugs 591425 and 606877, dactyl bug #81

6
common/modules/bookmarkcache.jsm
View File

@@ -63,7 +63,7 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
get bookmarks() Class.replaceProperty(this, "bookmarks", this.load()),
get keywords() array.toObject([[b.keyword, b] for (b in this) if (b.keyword)]),
keywords: Class.memoize(function () array.toObject([[b.keyword, b] for (b in this) if (b.keyword)])),
rootFolders: ["toolbarFolder", "bookmarksMenuFolder", "unfiledBookmarksFolder"]
.map(function (s) services.bookmarks[s]),
@@ -185,11 +185,13 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
let bmark = this._loadBookmark(this.readBookmark(itemId));
this.bookmarks[bmark.id] = bmark;
storage.fireEvent(name, "add", bmark);
delete this.keywords;
}
}
},
onItemRemoved: function onItemRemoved(itemId, folder, index) {
let result = this._deleteBookmark(itemId);
delete this.keywords;
if (result)
storage.fireEvent(name, "remove", result);
},
@@ -204,6 +206,8 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
let bookmark = this.bookmarks[itemId];
if (bookmark) {
if (property == "keyword")
delete this.keywords;
if (property == "tags")
value = services.tagging.getTagsForURI(bookmark.uri, {});
if (property in bookmark) {