From be78355e8374c566488e1004e3f3c41785dd3dd0 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 8 Apr 2018 19:48:21 -0400
Subject: [DEVTOOLS] Resolve issues with dynamically created devtools menu
 items vs hardcoded vs overlay

Follow up to 1a36001
---
 application/palemoon/base/content/browser-appmenu.inc | 4 ++--
 application/palemoon/base/content/browser-menubar.inc | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser-appmenu.inc b/application/palemoon/base/content/browser-appmenu.inc
index 4869afa11..cfc855484 100644
--- a/application/palemoon/base/content/browser-appmenu.inc
+++ b/application/palemoon/base/content/browser-appmenu.inc
@@ -144,10 +144,10 @@
                     observes="workOfflineMenuitemState"
                     oncommand="BrowserOffline.toggleOfflineStatus();"/>
           <menuseparator/>
-          <menuitem id="appmenu_javascriptConsole"
-                    observes="devtoolsMenuBroadcaster_ErrorConsole"/>
           <menuitem id="appmenu_pageSource"
                     observes="devtoolsMenuBroadcaster_PageSource"/>
+          <menuitem id="appmenu_javascriptConsole"
+                    observes="devtoolsMenuBroadcaster_ErrorConsole"/>
         </menupopup>
       </splitmenu>
       <menuseparator class="appmenu-menuseparator"/>
diff --git a/application/palemoon/base/content/browser-menubar.inc b/application/palemoon/base/content/browser-menubar.inc
index e947e7d79..fc6bc7694 100644
--- a/application/palemoon/base/content/browser-menubar.inc
+++ b/application/palemoon/base/content/browser-menubar.inc
@@ -534,12 +534,12 @@
                     label="&webDeveloperMenu.label;"
                     accesskey="&webDeveloperMenu.accesskey;">
                 <menupopup id="menuWebDeveloperPopup">
-                  <menuitem id="javascriptConsole"
-                            observes="devtoolsMenuBroadcaster_ErrorConsole"
-                            accesskey="&errorConsoleCmd.accesskey;"/>
                   <menuitem id="menu_pageSource"
                             observes="devtoolsMenuBroadcaster_PageSource"
                             accesskey="&pageSourceCmd.accesskey;"/>
+                  <menuitem id="javascriptConsole"
+                            observes="devtoolsMenuBroadcaster_ErrorConsole"
+                            accesskey="&errorConsoleCmd.accesskey;"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"
-- 
cgit v1.2.3