Bug 1559127 - Disable the appmenu's "Go > Recently Closed Tabs" when needed. r=darktrojan
authorPaul Morris <paul@paulwmorris.com>
Wed, 03 Jul 2019 16:59:28 -0400
changeset 36047 c14bd4ff44b033c9a5531a41f4cee1b82e4178c4
parent 36046 56dea140befc70ad166017e5572eff48aa0af57b
child 36048 2f0f868999d819e189bd67142aea132efb8a25c4
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersdarktrojan
bugs1559127
Bug 1559127 - Disable the appmenu's "Go > Recently Closed Tabs" when needed. r=darktrojan
mail/components/customizableui/content/panelUI.inc.xul
mail/components/customizableui/moz.build
--- a/mail/components/customizableui/content/panelUI.inc.xul
+++ b/mail/components/customizableui/content/panelUI.inc.xul
@@ -1305,16 +1305,17 @@
                        class="subviewbutton subviewbutton-nav"
                        label="&folderMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-goFolderView', this)"/>
         <toolbarseparator id="appmenu_goFolderSeparator"/>
         <toolbarbutton id="appmenu_goRecentlyClosedTabs"
                        class="subviewbutton subviewbutton-nav"
                        label="&goRecentlyClosedTabs.label;"
+                       observes="cmd_undoCloseTab"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-goRecentlyClosedTabsView', this)"/>
         <toolbarseparator id="appmenu_goRecentlyClosedTabsSeparator"/>
         <toolbarbutton id="appmenu_goStartPage"
                        class="subviewbutton subviewbutton-iconic"
                        label="&startPageCmd.label;"
                        key="key_goStartPage"
                        command="cmd_goStartPage"/>
@@ -1382,21 +1383,16 @@
                showRecent="true"
                showFavorites="true"
                command="cmd_goFolder"
                recentLabel="&contextMoveCopyMsgRecentMenu.label;"
                favoritesLabel="&contextMoveCopyMsgFavoritesMenu.label;"/>
 
     <!-- Go / Recently Closed Tabs -->
     <!-- Dynamically populated when shown. -->
-    <!-- TODO appmenu - what about this 'observes' bit?
-        <menu id="appmenu_goRecentlyClosedTabs"
-                  label="&goRecentlyClosedTabs.label;"
-                  observes="cmd_undoCloseTab">
-    -->
     <panelview id="appMenu-goRecentlyClosedTabsView"
                title="&goRecentlyClosedTabs.label;"
                class="PanelUI-subView">
       <vbox class="panel-subview-body"/>
     </panelview>
 
 
     <!-- Message -->
--- a/mail/components/customizableui/moz.build
+++ b/mail/components/customizableui/moz.build
@@ -3,24 +3,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
     'content',
 ]
 
-# TODO appmenu - Not currently used for Thunderbird.
-# BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
-
-# TODO appmenu - Not currently used for Thunderbird.
-# TESTING_JS_MODULES += [
-#     'test/CustomizableUITestUtils.jsm',
-# ]
-
 EXTRA_JS_MODULES += [
     'CustomizableUI.jsm',
     'CustomizableWidgets.jsm',
     'CustomizeMode.jsm',
     'DragPositionManager.jsm',
     'PanelMultiView.jsm',
     'SearchWidgetTracker.jsm',
 ]