Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 366589 - Avoid places URIs parsing in the history sidebar. r=sspitzer.

Browse Source
This commit is contained in:
mozilla.mano%sent.com 2007-01-11 09:00:47 +00:00
parent 22507df421
commit 2a02122616
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@
var gHistoryTree;
var gSearchBox;
var gHistoryGrouping = "";
var gSearching = false;
function HistorySidebarInit()
{
@ -90,54 +91,12 @@ function checkURLSecurity(aURL)
}
return true;
}
function SetPlace(aSearchString)
{
const NHQO = Ci.nsINavHistoryQueryOptions;
var placeURI = ORGANIZER_ROOT_HISTORY_UNSORTED;
var prefService =
Components.classes["@mozilla.org/preferences-service;1"]
.getService(Ci.nsIPrefBranch);
if (prefService.getBoolPref("browser.history.showSessions"))
placeURI += "&showSessions=1";
switch (gHistoryGrouping) {
case "site":
placeURI += "&sort=" + NHQO.SORT_BY_TITLE_ASCENDING;
break;
case "visited":
placeURI += "&sort=" + NHQO.SORT_BY_VISITCOUNT_DESCENDING;
break;
case "lastvisited":
placeURI += "&sort=" + NHQO.SORT_BY_DATE_DESCENDING;
break;
case "dayandsite":
// if there isn't a search string, add the grouping
if (!aSearchString) {
placeURI += "&group=" + NHQO.GROUP_BY_DAY;
placeURI += "&group=" + NHQO.GROUP_BY_HOST;
}
placeURI += "&sort=" + NHQO.SORT_BY_TITLE_ASCENDING;
break;
default: /* "day" */
// if there isn't a search string, add the grouping
if (!aSearchString)
placeURI += "&group=" + NHQO.GROUP_BY_DAY;
placeURI += "&sort=" + NHQO.SORT_BY_TITLE_ASCENDING;
break;
}
gHistoryTree.place = placeURI;
}
function GroupBy(groupingType)
{
{
gHistoryGrouping = groupingType;
gSearchBox.value = "";
searchHistory(gSearchBox.value);
searchHistory("");
}
function collapseExpand()
@ -274,12 +233,50 @@ function buildContextMenu(aEvent)
}
}
function SetSortingAndGrouping() {
const NHQO = Ci.nsINavHistoryQueryOptions;
var sortingMode;
var groups = [];
switch (gHistoryGrouping) {
case "site":
sortingMode = NHQO.SORT_BY_TITLE_ASCENDING;
break;
case "visited":
sortingMode = NHQO.SORT_BY_VISITCOUNT_DESCENDING;
break;
case "lastvisited":
sortingMode = NHQO.SORT_BY_DATE_DESCENDING;
break;
case "dayandsite":
groups.push(NHQO.GROUP_BY_DAY);
groups.push(NHQO.GROUP_BY_HOST);
sortingMode = NHQO.SORT_BY_TITLE_ASCENDING;
break;
default:
groups.push(NHQO.GROUP_BY_DAY);
sortingMode = NHQO.SORT_BY_TITLE_ASCENDING;
break;
}
var options = asQuery(gHistoryTree.getResult().root).queryOptions;
options.setGroupingMode(groups, groups.length);
options.sortingMode = sortingMode;
}
function searchHistory(aInput)
{
SetPlace(aInput);
if (!aInput)
return;
if (aInput) {
if (!gSearching) {
// Unset grouping when searching; applyFilter will update the view
var options = asQuery(gHistoryTree.getResult().root).queryOptions;
options.setGroupingMode([], 0);
gSearching = true;
}
}
else {
// applyFilter will update the view
SetSortingAndGrouping();
gSearching = false;
}
gHistoryTree.applyFilter(aInput, false /* onlyBookmarks */,
0 /* folderRestrict */, null);

5
browser/components/places/content/history-panel.xul
View File

@ -138,7 +138,10 @@
</button>
</hbox>
<tree id="historyTree" flex="1" type="places"
<tree id="historyTree"
flex="1"
type="places"
place="place:&amp;beginTime=-2592000000000&amp;beginTimeRef=1&amp;endTime=7200000000&amp;endTimeRef=2&amp;type=1"
context="historyContextMenu"
onkeypress="if (event.keyCode == 13) openURL(event);"
hidecolumnpicker="true"