wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix for bug #384671: when resetting the history sidebar view, don't use applyFilter()

Browse Source 
this is needed for bug #380735, for when we persist day and host container
open state in the history sidebar.

additionally, call load() instead of using .place directly to avoid doing queriesToQueryString() only to call queryStringToQueries().

r=mano
This commit is contained in:
sspitzer@mozilla.org 2007-06-18 18:31:51 -07:00
parent 16a5902d61
commit 006402d0e9
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
browser/components/places/content/history-panel.js
View File

@ -64,14 +64,7 @@ function HistorySidebarInit()
initContextMenu();
// set the place on the tree dynamically
// otherwise, we will end up calling the place's tree's load() twice
var optionsRef = {};
var queriesRef = {};
PlacesUtils.history.queryStringToQueries(ORGANIZER_ROOT_HISTORY_UNSORTED, queriesRef, {}, optionsRef);
SetSortingAndGrouping(optionsRef.value);
var place = PlacesUtils.history.queriesToQueryString(queriesRef.value, 1, optionsRef.value);
gHistoryTree.place = place;
initPlace();
gSearchBox.focus();
}
@ -148,24 +141,34 @@ function SetSortingAndGrouping(aOptions)
aOptions.sortingMode = sortingMode;
}
function initPlace()
{
// call load() on the tree manually
// instead of setting the place attribute in history-panel.xul
// otherwise, we will end up calling load() twice
var optionsRef = {};
var queriesRef = {};
PlacesUtils.history.queryStringToQueries(ORGANIZER_ROOT_HISTORY_UNSORTED, queriesRef, {}, optionsRef);
SetSortingAndGrouping(optionsRef.value);
gHistoryTree.load(queriesRef.value, optionsRef.value);
}
function searchHistory(aInput)
{
if (aInput) {
if (!gSearching) {
// Unset grouping when searching; applyFilter will update the view
// Unset grouping when searching;
var options = gHistoryTree.getResult().root.queryOptions;
options.setGroupingMode([], 0);
gSearching = true;
}
// applyFilter will update the view by calling load()
gHistoryTree.applyFilter(aInput, false /* onlyBookmarks */,
null /* folderRestrict */, null);
}
else {
// applyFilter will update the view
var options = gHistoryTree.getResult().root.queryOptions;
SetSortingAndGrouping(options);
initPlace();
gSearching = false;
}
gHistoryTree.applyFilter(aInput, false /* onlyBookmarks */,
null /* folderRestrict */, null);
}