Bug 175175 - Add ids to Bookmark Menupopups. r=Mnyromyr
authorEdmund Wong <ewong@pw-wspx.org>
Fri, 07 Sep 2012 10:16:10 +0800
changeset 12251 f6cce22f417f78cd50db60326aaf97c7dbf03420
parent 12250 6ed66e622bb08f2c0672898fdd09e27dd0cbecb9
child 12252 1bdd4637a53c42c72a0b54519f9d3257ad20f8d2
push id738
push userbugzilla@standard8.plus.com
push dateMon, 08 Oct 2012 19:38:39 +0000
treeherdercomm-aurora@6694e4ec3767 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMnyromyr
bugs175175
Bug 175175 - Add ids to Bookmark Menupopups. r=Mnyromyr
suite/browser/navigatorOverlay.xul
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -294,41 +294,66 @@
     </menu>
 
     <menu id="menu_View">
       <menupopup id="menu_View_Popup">
         <menu label="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;" id="menu_Toolbars">
           <menupopup id="view_toolbars_popup"
                      onpopupshowing="updateToolbarStates(event);"
                      oncommand="onViewToolbarCommand(event);">
-            <menuitem id="menuitem_showhide_tabbar" label="&tabbarCmd.label;" accesskey="&tabbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="showHideTabbar();" checked="true"/>
-            <menuitem label="&taskbarCmd.label;" accesskey="&taskbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewtaskbar" />
-            <menuitem label="&componentbarCmd.label;" accesskey="&componentbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewcomponentbar"/>
+            <menuitem id="menuitem_showhide_tabbar"
+                      label="&tabbarCmd.label;"
+                      accesskey="&tabbarCmd.accesskey;"
+                      class="menuitem-iconic"
+                      type="checkbox"
+                      oncommand="showHideTabbar();"
+                      checked="true"/>
+            <menuitem id="menuitem_taskbarCmd"
+                      label="&taskbarCmd.label;"
+                      accesskey="&taskbarCmd.accesskey;"
+                      class="menuitem-iconic"
+                      type="checkbox"
+                      observes="cmd_viewtaskbar"/>
+            <menuitem id="menuitem_componentbarCmd"
+                      label="&componentbarCmd.label;"
+                      accesskey="&componentbarCmd.accesskey;"
+                      class="menuitem-iconic"
+                      type="checkbox"
+                      observes="cmd_viewcomponentbar"/>
           </menupopup>
         </menu>   
         <menuitem id="menuitem_fullScreen"
                   label="&fullScreenCmd.label;"
                   accesskey="&fullScreenCmd.accesskey;"
                   key="key_fullScreen"
                   command="View:FullScreen"/>
         <menuseparator />
-        <menuitem label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" id="menuitem-stop" disabled="true" oncommand="BrowserStop();" key="key_stop"/>
+        <menuitem id="menuitem-stop"
+                  label="&stopCmd.label;"
+                  accesskey="&stopCmd.accesskey;"
+                  disabled="true"
+                  oncommand="BrowserStop();"
+                  key="key_stop"/>
         <menuitem id="menuitem_reload"
                   label="&reloadCmd.label;"
                   accesskey="&reloadCmd.accesskey;"
                   key="key_reload"
                   oncommand="BrowserReload(event);"
                   onclick="checkForMiddleClick(this, event);"/>
         <menuseparator />
 
         <!-- overlayed from viewZoomOverlay.xul -->
         <menu id="menu_zoom"/>
 
-        <menu id="menu_UseStyleSheet" label="&useStyleSheetMenu.label;" accesskey="&useStyleSheetMenu.accesskey;" disabled="false" observes="isImage">
-          <menupopup onpopupshowing="stylesheetFillPopup(this);"
+        <menu id="menu_UseStyleSheet"
+              label="&useStyleSheetMenu.label;"
+              accesskey="&useStyleSheetMenu.accesskey;"
+              disabled="false"
+              observes="isImage">
+          <menupopup id="menupopup_stylesheetFill" onpopupshowing="stylesheetFillPopup(this);"
                      oncommand="stylesheetSwitchAll(window.content, event.target.getAttribute('data')); setStyleDisabled(false);" type="radio">
             <menuitem id="menu_pageStyleNoStyle"
                       label="&useStyleSheetNone.label;"
                       accesskey="&useStyleSheetNone.accesskey;"
                       oncommand="setStyleDisabled(true); event.stopPropagation();"
                       type="radio"/>
             <menuitem id="menu_pageStylePersistentOnly"
                       label="&useStyleSheetPersistentOnly.label;"
@@ -337,18 +362,26 @@
           </menupopup>
         </menu>
         <menu id="charsetMenu" observes="isImage"/>
         <menuitem hidden="true" id="documentDirection-swap"
                   label="&bidiSwitchPageDirectionItem.label;"
                   accesskey="&bidiSwitchPageDirectionItem.accesskey;"
                   command="cmd_SwitchDocumentDirection"/>
         <menuseparator />
-        <menuitem accesskey="&pageSourceCmd.accesskey;" label="&pageSourceCmd.label;" key="key_viewSource" command="View:PageSource"/>
-        <menuitem accesskey="&pageInfoCmd.accesskey;"   label="&pageInfoCmd.label;"   key="key_viewInfo"   command="View:PageInfo"/>
+        <menuitem id="menuitem_pageSourceCmd"
+                  label="&pageSourceCmd.label;"
+                  accesskey="&pageSourceCmd.accesskey;"
+                  key="key_viewSource"
+                  command="View:PageSource"/>
+        <menuitem id="menuitem_pageInfoCmd"
+                  label="&pageInfoCmd.label;"
+                  accesskey="&pageInfoCmd.accesskey;"
+                  key="key_viewInfo"
+                  command="View:PageInfo"/>
         <menuseparator />
         <!-- overlayed from viewApplyThemeOverlay.xul -->
         <menu id="menu_viewApplyTheme"/>
       </menupopup>
     </menu>
 
     <menu id="history-menu"
           label="&goMenu.label;"
@@ -439,18 +472,21 @@
                   command="Browser:AddBookmarkAs"
                   key="addBookmarkAsKb"/>
         <menuitem id="menu_bookmarkAllTabs"
                   command="Browser:BookmarkAllTabs"/>
         <menuitem id="menu_bookmarkManager"
                   command="Browser:ManageBookmark"
                   key="manBookmarkKb"/>
         <menuseparator id="organizeBookmarksSeparator"/>
-        <menu class="menu-iconic feedsMenu" command="feedsMenu"
-              label="&feedsMenu.label;" accesskey="&feedsMenu.accesskey;">
+        <menu id="menu_iconic_feedsMenu"
+              label="&feedsMenu.label;"
+              accesskey="&feedsMenu.accesskey;"
+              class="menu-iconic feedsMenu"
+              command="feedsMenu">
           <menupopup onpopupshowing="window.XULBrowserWindow.populateFeeds(this);"
                      oncommand="subscribeToFeed(event.target.statusText, event);"
                      onclick="checkForMiddleClick(this, event);"/>
         </menu>
         <menuseparator/>
         <menu id="bookmarksToolbarFolderMenu"
               class="menu-iconic bookmark-item"
               label="&bookmarksToolbarCmd.label;"
@@ -485,17 +521,18 @@
                   label="&translateMenu.label;"
                   accesskey="&translateMenu.accesskey;"
                   oncommand="Translate();"/>
         <menu id="menu_cookieManager"
               label="&cookieCookieManager.label;"
               accesskey="&cookieCookieManager.accesskey;"
               oncommand="if (event.target.id) CookieImageAction(event.target);
                          else toDataManager('|cookies');">
-          <menupopup onpopupshowing="CheckPermissionsMenu('cookie', this);">
+          <menupopup id="menupopup_checkPermissions_cookie"
+                     onpopupshowing="CheckPermissionsMenu('cookie', this);">
             <menuitem id="cookie_deny"
                       label="&cookieBlockCookiesCmd.label;"
                       accesskey="&cookieBlockCookiesCmd.accesskey;"
                       title="&cookieMessageTitle.label;"
                       msg="&cookieBlockCookiesMsg.label;"
                       type="radio"
                       name="cookie"/>
             <menuitem id="cookie_default"
@@ -524,17 +561,18 @@
                       accesskey="&cookieDisplayCookiesCmd.accesskey;"/>
           </menupopup>
         </menu>
         <menu id="menu_imageManager"
               label="&cookieImageManager.label;"
               accesskey="&cookieImageManager.accesskey;"
               oncommand="if (event.target.id) CookieImageAction(event.target);
                          else toDataManager('|permissions');">
-          <menupopup onpopupshowing="CheckPermissionsMenu('image', this);">
+          <menupopup id="menupopup_checkPermissions_image"
+                     onpopupshowing="CheckPermissionsMenu('image', this);">
             <menuitem id="image_deny"
                       label="&cookieBlockImagesCmd.label;"
                       accesskey="&cookieBlockImagesCmd.accesskey;"
                       title="&cookieImageMessageTitle.label;"
                       msg="&cookieBlockImagesMsg.label;"
                       type="radio"
                       name="image"/>
             <menuitem id="image_default"
@@ -547,25 +585,27 @@
             <menuitem id="image_allow"
                       label="&cookieAllowImagesCmd.label;"
                       accesskey="&cookieAllowImagesCmd.accesskey;"
                       title="&cookieImageMessageTitle.label;"
                       msg="&cookieAllowImagesMsg.label;"
                       type="radio"
                       name="image"/>
             <menuseparator/>
-            <menuitem label="&cookieDisplayImagesCmd.label;"
+            <menuitem id="menuitem_cookieDisplay"
+                      label="&cookieDisplayImagesCmd.label;"
                       accesskey="&cookieDisplayImagesCmd.accesskey;"/>
           </menupopup>
         </menu>
         <menu id="menu_popupManager"
               label="&cookiePopupManager.label;"
               accesskey="&cookiePopupManager.accesskey;"
               oncommand="popupBlockerMenuCommand(event.target);">
-          <menupopup onpopupshowing="CheckForVisibility(event);"
+          <menupopup id="menupopup_checkForVisibility"
+                     onpopupshowing="CheckForVisibility(event);"
                      onpopuphiding="RemovePopupsItems(this);">
             <menuitem id="AllowPopups"
                       label="&cookieAllowPopupsCmd.label;"
                       accesskey="&cookieAllowPopupsCmd.accesskey;"
                       oncommand="toDataManager(popupHost() + '|permissions|add|popup');"/>
             <menuitem id="ManagePopups"
                       label="&cookieManagePopups.label;"
                       accesskey="&cookieManagePopups.accesskey;"
@@ -573,18 +613,18 @@
                       hidden="true"/>
             <menuseparator id="popupMenuSeparator" hidden="true"/>
             <!-- Additional items are generated (except for mac - bug 533097)
                  by popupBlockerMenuShowing() in navigator.js. -->
           </menupopup>
         </menu>
         <menuseparator id="navBeginGlobalItems"/>
         <menuitem id="sanitizeItem"
+                  label="&clearPrivateDataCmd.label;"
                   accesskey="&clearPrivateDataCmd.accesskey;"
-                  label="&clearPrivateDataCmd.label;"
                   key="key_sanitize" command="Tools:Sanitize"/>
       </menupopup>
     </menu>
 
     <menu id="windowMenu"/>
 
     <menu id="menu_Help"/>
   </menubar>