[Pkg-mozext-commits] [tabmixplus] 42/47: Follow up bug 1000513 - Combined navigation items in the context menu

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch upstream
in repository tabmixplus.

commit 7c4276ca9791eb1201f3adcb534be6eb6976cbfc
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Sep 24 23:37:29 2014 +0300

    Follow up bug 1000513 - Combined navigation items in the context menu
---
 chrome/content/click/click.js |  4 ++++
 chrome/content/tabmix.xul     | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index 861845b..9aef45b 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -331,6 +331,10 @@ var TabmixContext = {
 
     if (Tabmix.prefs.getBoolPref("showTabContextMenuOnTabbar"))
       this.updateTabbarContextMenu(true);
+
+    // move tm-content-miscSep to its place (Firefox 32+)
+    let sep = $id("tm-content-miscSep");
+    sep.parentNode.insertBefore(sep, $id("tm-content-closetab"));
   },
 
   updateTabbarContextMenu: function(show) {
diff --git a/chrome/content/tabmix.xul b/chrome/content/tabmix.xul
index 5969275..d4b03ce 100644
--- a/chrome/content/tabmix.xul
+++ b/chrome/content/tabmix.xul
@@ -120,40 +120,40 @@
       <menuitem id="tm-linkWithhistory" label="&linkwithhistory.label;" accesskey="&linkwithhistory.accesskey;"
          insertafter="context-openlinkintab" oncommand="gBrowser.openLinkWithHistory(gBrowser.mCurrentTab);"/>
       <menuseparator id="tm-content-miscSep" insertafter="context-stop"/>
-      <menuitem id="tm-content-closetab" label="&closeTab.label;" oncommand="gBrowser.removeCurrentTab();" insertbefore="context-sep-stop"/>
+      <menuitem id="tm-content-closetab" label="&closeTab.label;" oncommand="gBrowser.removeCurrentTab();" insertbefore="context-sep-stop,context-sep-viewbgimage"/>
       <menuitem id="tm-duplicateTabContext" key="key_tm_dupTab" label="&duplicateTabMenu.label;" accesskey="&duplicateTabMenu.accesskey;"
-         oncommand="gBrowser.duplicateTab(gBrowser.mCurrentTab);" insertbefore="context-sep-stop"/>
+         oncommand="gBrowser.duplicateTab(gBrowser.mCurrentTab);" insertbefore="context-sep-stop,context-sep-viewbgimage"/>
       <menuitem id="tm-duplicateinWinContext" key="key_tm_dupWin" label="&duplicateinWin.label;" accesskey="&duplicateinWin.accesskey;"
-         oncommand="gBrowser.duplicateTabToWindow(gBrowser.mCurrentTab, false);" insertbefore="context-sep-stop"/>
+         oncommand="gBrowser.duplicateTabToWindow(gBrowser.mCurrentTab, false);" insertbefore="context-sep-stop,context-sep-viewbgimage"/>
       <menuitem id="tm-detachTabContext" key="key_tm_detachTab" label="&detachTab.label;" accesskey="&detachTab.accesskey;"
-         oncommand="gBrowser.duplicateTabToWindow(gBrowser.mCurrentTab, true);" insertbefore="context-sep-stop"/>
-      <menuitem id="tm-mergeWindows" key="key_tm_mergeWin" label="&mergeContext.label;" accesskey="&mergeContext.accesskey;" oncommand="Tabmix.MergeWindows.mergeWindows(window);" insertbefore="context-sep-stop" />
+         oncommand="gBrowser.duplicateTabToWindow(gBrowser.mCurrentTab, true);" insertbefore="context-sep-stop,context-sep-viewbgimage"/>
+      <menuitem id="tm-mergeWindows" key="key_tm_mergeWin" label="&mergeContext.label;" accesskey="&mergeContext.accesskey;" oncommand="Tabmix.MergeWindows.mergeWindows(window);" insertbefore="context-sep-stop,context-sep-viewbgimage" />
       <menuitem id="tm-content-freezeTab" type="checkbox" oncommand="gBrowser.freezeTab(gBrowser.mCurrentTab);"
-         insertbefore="context-sep-stop" label="&freezeTabMenu.label;" accesskey="&freezeTabMenu.accesskey;"/>
+         insertbefore="context-sep-stop,context-sep-viewbgimage" label="&freezeTabMenu.label;" accesskey="&freezeTabMenu.accesskey;"/>
       <menuitem id="tm-content-protectTab" type="checkbox"
          oncommand="gBrowser.protectTab(gBrowser.mCurrentTab);"
-         insertbefore="context-sep-stop" label="&protectTabMenu.label;" accesskey="&protectTabMenu.accesskey;"/>
+         insertbefore="context-sep-stop,context-sep-viewbgimage" label="&protectTabMenu.label;" accesskey="&protectTabMenu.accesskey;"/>
       <menuitem id="tm-content-lockTab" type="checkbox"
          oncommand="gBrowser.lockTab(gBrowser.mCurrentTab);"
-         insertbefore="context-sep-stop" label="&lockTabMenu.label;" accesskey="&lockTabMenu.accesskey;"/>
-      <menu id="tm-tabsList" label="&tabsList.label;" accesskey="&tabsList.accesskey;" insertbefore="context-sep-stop" tmp_iconic="menu-iconic">
+         insertbefore="context-sep-stop,context-sep-viewbgimage" label="&lockTabMenu.label;" accesskey="&lockTabMenu.accesskey;"/>
+      <menu id="tm-tabsList" label="&tabsList.label;" accesskey="&tabsList.accesskey;" insertbefore="context-sep-stop,context-sep-viewbgimage" tmp_iconic="menu-iconic">
         <menupopup id="tm-tabsList-menu"
            onpopupshowing="TabmixAllTabs.createTabsList(this, 2);"
            onpopuphidden="TabmixAllTabs.hideCommonList(this);"
            onclick="TabmixAllTabs.removeTabFromList(event, this, 2);"
            oncommand="gBrowser.selectedTab = gBrowser.tabs[event.originalTarget.value];"/>
        </menu>
-      <menuseparator id="tm-content-undoCloseSep" insertbefore="context-sep-stop"/>
-      <menuitem id="tm-content-undoCloseTab" oncommand="TMP_ClosedTabs.undoCloseTab();" insertbefore="context-sep-stop"
+      <menuseparator id="tm-content-undoCloseSep" insertbefore="context-sep-stop,context-sep-viewbgimage"/>
+      <menuitem id="tm-content-undoCloseTab" oncommand="TMP_ClosedTabs.undoCloseTab();" insertbefore="context-sep-stop,context-sep-viewbgimage"
          key="key_undoCloseTab" label="&undoCloseTab.label;" accesskey="&undoCloseTab.accesskey;"/>
       <menu id="tm-content-undoCloseList" label="&undoCloseListMenu.label;" accesskey="&undoCloseListMenu.accesskey;" tmp_iconic="menu-iconic closedtabs-icon"
-         insertbefore="context-sep-stop">
+         insertbefore="context-sep-stop,context-sep-viewbgimage">
         <menupopup id="tm-content-undoCloseList-menu"
           onpopupshowing="TMP_ClosedTabs.populateUndoSubmenu(this);"
           onpopuphidden="TabmixAllTabs.hideCommonList(this);"/>
       </menu>
       <menuseparator id="tm-content-textSep" insertbefore="context-sep-undo"/>
-      <menu id="tm-autoreload_menu" insertafter="context-reload"
+      <menu id="tm-autoreload_menu" insertafter="context-sep-navigation,context-reload"
             labelTab="&autoReloadTab.label;" accesskeyTab="&autoReloadTab.accesskey;"
             labelSite="&autoReloadSite.label;" accesskeySite="&autoReloadSite.accesskey;">
         <menupopup onpopupshowing="Tabmix.autoReload.onPopupShowing(this, gBrowser.mCurrentTab);"/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git