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

suite/common/history/history.js

@@ -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 rowIsContainer = gHistoryGrouping != "none" && currentIndex >= 0 && isContainer(gHistoryTree, currentIndex);
-    var url = gHistoryTree.treeBoxObject.view.getCellText(currentIndex, "URL");
+    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", "find:datasource=history&groupby=Hostname");
-        tree.setAttribute("ref", "NC:HistoryByDate");
         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();

suite/locales/en-US/chrome/common/history/history.dtd

@@ -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">