Bug 655776 - Web Developer > Get More Tools menu item. r=dao ui-r=limi
authorMihai Sucan <mihai.sucan@gmail.com>
Tue, 24 May 2011 08:43:48 +0200
changeset 70080 90465908ac893325ad04c1877160d983eabbff81
parent 70079 381e9216f883f36bf0785d1b72082599e57a7ac5
child 70081 bb5904c365a23d914534123f5fdb757d1779aeb1
push id20176
push userdgottwald@mozilla.com
push dateTue, 24 May 2011 10:00:28 +0000
treeherdermozilla-central@bb5904c365a2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao, limi
bugs655776
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 655776 - Web Developer > Get More Tools menu item. r=dao ui-r=limi
browser/base/content/browser-appmenu.inc
browser/base/content/browser-menubar.inc
browser/base/content/test/Makefile.in
browser/base/content/test/browser_webdev_menu.js
browser/locales/en-US/chrome/browser/browser.dtd
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -196,16 +196,20 @@
                     label="&viewPageSourceCmd.label;"
                     command="View:PageSource"
                     key="key_viewSource"/>
           <menuitem id="appmenu_errorConsole"
                     hidden="true"
                     label="&errorConsoleCmd.label;"
                     key="key_errorConsole"
                     oncommand="toJavaScriptConsole();"/>
+          <menuseparator id="appmenu_devToolsEndSeparator"/>
+          <menuitem id="appmenu_getMoreDevtools"
+                    label="&getMoreDevtoolsCmd.label;"
+                    oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
           <menuseparator/>
 #define ID_PREFIX appmenu_developer_
 #define OMIT_ACCESSKEYS
 #include browser-charsetmenu.inc
 #undef ID_PREFIX
 #undef OMIT_ACCESSKEYS
           <menuitem label="&goOfflineCmd.label;"
                     type="checkbox"
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -562,16 +562,21 @@
                             key="key_viewSource"
                             command="View:PageSource"/>
                   <menuitem id="javascriptConsole"
                             hidden="true"
                             label="&errorConsoleCmd.label;"
                             accesskey="&errorConsoleCmd.accesskey;"
                             key="key_errorConsole"
                             oncommand="toJavaScriptConsole();"/>
+                  <menuseparator id="devToolsEndSeparator"/>
+                  <menuitem id="getMoreDevtools"
+                            label="&getMoreDevtoolsCmd.label;"
+                            accesskey="&getMoreDevtoolsCmd.accesskey;"
+                            oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"
                         accesskey="&pageInfoCmd.accesskey;"
                         label="&pageInfoCmd.label;"
 #ifndef XP_WIN
                         key="key_viewInfo"
 #endif
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -227,17 +227,16 @@ endif
                  browser_tabs_owner.js \
                  browser_urlHighlight.js \
                  browser_visibleFindSelection.js \
                  browser_visibleTabs.js \
                  browser_visibleTabs_contextMenu.js \
                  browser_visibleTabs_bookmarkAllPages.js \
                  browser_visibleTabs_bookmarkAllTabs.js \
                  browser_visibleTabs_tabPreview.js \
-                 browser_webdev_menu.js \
                  bug592338.html \
                  disablechrome.html \
                  discovery.html \
                  domplate_test.js \
                  moz.png \
                  test_bug435035.html \
                  test_bug462673.html \
                  page_style_sample.html \
deleted file mode 100644
--- a/browser/base/content/test/browser_webdev_menu.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function menuTest()
-{
-  gBrowser.selectedBrowser.removeEventListener("load", menuTest, true);
-
-  let menuContents = [
-    "menu_pageinspect",
-    "webConsole",
-    "menu_scratchpad",
-    "menu_pageSource",
-    "javascriptConsole"
-  ];
-
-  let menu = document.getElementById("webDeveloperMenu");
-  ok(menu, "we have the menu");
-
-  let popup = menu.firstChild;
-  is(popup.id, "menuWebDeveloperPopup", "menu first child is menuWebDeveloperPopup");
-
-  is(popup.childNodes.length, menuContents.length, "popup childNodes.length matches");
-
-  for(let a = 0; a < popup.children.length; a++) {
-    isnot(menuContents.indexOf(popup.children[a].id), -1, "menuitem " + popup.children[a].id + " in popup");
-  };
-
-  gBrowser.removeCurrentTab();
-  finish();  
-}
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", menuTest, true);
-
-  content.location = "data:text/html,<title>Web Developer Menu Test</title>" +
-    "<p>testing the Web Developer Menu";
-}
-
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -221,16 +221,19 @@ can reach it easily. -->
 <!ENTITY inspectStylePanelTitle.label  "Style">
 <!-- LOCALIZATION NOTE (inspectObjectButton.label): This button label
   -  appears on the Inspector's toolbar. It is used to open and close the Object
   -  panel. There is also a label in inspector.properties for the panel
   -  titlebar: object.objectPanelTitle. -->
 <!ENTITY inspectObjectButton.label       "Object">
 <!ENTITY inspectObjectButton.accesskey   "O">
 
+<!ENTITY getMoreDevtoolsCmd.label        "Get More Tools">
+<!ENTITY getMoreDevtoolsCmd.accesskey    "M">
+
 <!ENTITY fileMenu.label         "File"> 
 <!ENTITY fileMenu.accesskey       "F">
 <!ENTITY newNavigatorCmd.label        "New Window">
 <!ENTITY newNavigatorCmd.key        "N">
 <!ENTITY newNavigatorCmd.accesskey      "N">
 
 <!ENTITY editMenu.label         "Edit"> 
 <!ENTITY editMenu.accesskey       "E">