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

Fix Minefield.

Browse Source
This commit is contained in:
Kris Maglione
2012-03-14 16:49:02 -04:00
parent 5cd16cf5c3
commit 352d1702a7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/modes.js
View File

@@ -299,7 +299,7 @@ var Modes = Module("modes", {
return; return;
} }
params = params || this.getMode(mainMode || this.main).params; params = params || Object.create(this.getMode(mainMode || this.main).params);
if (!stack && mainMode != null && this._modeStack.length > 1) if (!stack && mainMode != null && this._modeStack.length > 1)
this.reset(); this.reset();

6
common/modules/bookmarkcache.jsm
View File

@@ -184,7 +184,11 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
let query = services.history.getNewQuery(); let query = services.history.getNewQuery();
let options = services.history.getNewQueryOptions(); let options = services.history.getNewQueryOptions();
options.queryType = options.QUERY_TYPE_BOOKMARKS; options.queryType = options.QUERY_TYPE_BOOKMARKS;
options.excludeItemIfParentHasAnnotation = "livemark/feedURI"; try {
// https://bugzil.la/702639
options.excludeItemIfParentHasAnnotation = "livemark/feedURI";
}
catch (e) {}
let { root } = services.history.executeQuery(query, options); let { root } = services.history.executeQuery(query, options);
root.containerOpen = true; root.containerOpen = true;