Bug 588593 - Can't right-click-move tab to un-named tab group; r=ttaubert

browser/base/content/browser-tabview.js

@@ -292,7 +292,7 @@ let TabView = {
         // if group has title, it's not hidden and there is no active group or
         // the active group id doesn't match the group id, a group menu item
         // would be added.
-        if (groupItem.getTitle().length > 0 && !groupItem.hidden &&
+        if (!groupItem.hidden && groupItem.getChildren().length &&
             (!activeGroup || activeGroup.id != groupItem.id)) {
           let menuItem = self._createGroupMenuItem(groupItem);
           popup.insertBefore(menuItem, separator);
@@ -305,10 +305,27 @@ let TabView = {
 
   // ----------
   _createGroupMenuItem: function TabView__createGroupMenuItem(groupItem) {
-    let menuItem = document.createElement("menuitem")
-    menuItem.setAttribute("label", groupItem.getTitle());
+    let menuItem = document.createElement("menuitem");
+    let title = groupItem.getTitle();
+
+    if (!title.trim()) {
+      let topChildLabel = groupItem.getTopChild().tab.label;
+
+      if (groupItem.getChildren().length > 1) {
+        title =
+          gNavigatorBundle.getFormattedString("tabview2.moveToUnnamedGroup.label",
+            [topChildLabel, groupItem.getChildren().length - 1]);
+      } else {
+        title = topChildLabel;
+      }
+    }
+
+    menuItem.setAttribute("label", title);
+    menuItem.setAttribute("tooltiptext", title);
+    menuItem.setAttribute("crop", "center");
+    menuItem.setAttribute("class", "tabview-menuitem");
     menuItem.setAttribute(
-      "oncommand", 
+      "oncommand",
       "TabView.moveTabTo(TabContextMenu.contextTab,'" + groupItem.id + "')");
 
     return menuItem;

browser/base/content/browser.css

@@ -545,5 +545,10 @@ statuspanel[inactive][previoustype=overLink] {
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#promobox");
 }
 
+/* tabview menus */
+.tabview-menuitem {
+  max-width: 32em;
+}
+
 /* highlighter */
 %include highlighter.css

browser/locales/en-US/chrome/browser/browser.properties

@@ -306,6 +306,7 @@ addKeywordTitleAutoFill=Search %S
 
 # TabView
 tabView2.title=%S - Group Your Tabs
+tabview2.moveToUnnamedGroup.label=%S and %S more
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme.