Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 144158 No Group by Site option in History r=timeless sr=alecf

Browse Source
This commit is contained in:
neil%parkwaycc.co.uk 2003-10-07 15:48:41 +00:00
parent 0448145fba
commit eaf1b8f138
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpfe/components/history/resources/history.js
View File

@ -97,6 +97,9 @@ function HistoryCommonInit()
case "none":
document.getElementById("groupByNone").setAttribute("checked", "true");
break;
case "site":
document.getElementById("groupBySite").setAttribute("checked", "true");
break;
case "day":
default:
document.getElementById("groupByDay").setAttribute("checked", "true");
@ -145,10 +148,10 @@ function historyOnSelect()
gLastDomain = "";
var match;
var currentIndex = gHistoryTree.currentIndex;
var rowIsContainer = gHistoryGrouping == "day" ? isContainer(gHistoryTree, currentIndex) : false;
var url = gHistoryTree.treeBoxObject.view.getCellText(currentIndex, "URL");
var rowIsContainer = gHistoryGrouping != "none" && currentIndex >= 0 && isContainer(gHistoryTree, currentIndex);
var url = rowIsContainer ? gHistoryTree.treeBoxObject.view.getCellText(currentIndex, "URL") : null;
if (url && !rowIsContainer) {
if (url) {
// matches scheme://(hostname)...
match = url.match(/^.*?:\/\/(?:([^\/:]*)(?::([^\/:]*))?@)?([^\/:]*)(?::([^\/:]*))?(.*)$/);
@ -327,8 +330,7 @@ function GroupBy(groupingType)
tree.setAttribute("ref", "NC:HistoryRoot");
break;
case "site":
// xxx for now
tree.setAttribute("ref", "NC:HistoryByDate");
tree.setAttribute("ref", "find:datasource=history&groupby=Hostname");
break;
case "day":
default:
@ -386,7 +388,7 @@ function updateItems()
var collapseExpandItem = document.getElementById("miCollapseExpand");
if (count > 1) {
var hasContainer = false;
if (gHistoryGrouping == "day") {
if (gHistoryGrouping != "none") {
var min = new Object();
var max = new Object();
var rangeCount = gHistoryTree.treeBoxObject.view.selection.getRangeCount();

1
xpfe/components/history/resources/history.xul
View File

@ -103,6 +103,7 @@
<menu id="groupingMenu" label="&groupBy.label;" accesskey="&groupBy.accesskey;">
<menupopup>
<menuitem id="groupByDay" label="&groupByDay.label;" accesskey="&groupByDay.accesskey;" type="radio" oncommand="GroupBy('day');"/>
<menuitem id="groupBySite" label="&groupBySite.label;" accesskey="&groupBySite.accesskey;" type="radio" oncommand="GroupBy('site');"/>
<menuitem id="groupByNone" label="&groupByNone.label;" accesskey="&groupByNone.accesskey;" type="radio" oncommand="GroupBy('none');"/>
</menupopup>
</menu>

2
xpfe/components/history/resources/locale/en-US/history.dtd
View File

@ -20,6 +20,8 @@
<!ENTITY groupBy.accesskey "G">
<!ENTITY groupByDay.label "Day">
<!ENTITY groupByDay.accesskey "D">
<!ENTITY groupBySite.label "Site">
<!ENTITY groupBySite.accesskey "S">
<!ENTITY groupByNone.label "None">
<!ENTITY groupByNone.accesskey "N">
<!ENTITY historyWindowTitle.label "History">