Bug 1590074 - follow-up to remove some CE widget includes no longer needed. r=pmorris
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Tue, 22 Oct 2019 14:14:18 +0300
changeset 36455 9bcb5b09c63b34da2d9ce6b8f64a2e00372b7235
parent 36454 0f8f556acd91d2df14283a04963c444ed9fdab69
child 36456 dd27120c0e4d7e614f2580938180294bce713406
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspmorris
bugs1590074
Bug 1590074 - follow-up to remove some CE widget includes no longer needed. r=pmorris
mailnews/base/content/newFolderDialog.xul
mailnews/base/content/newmailalert.xul
mailnews/base/content/subscribe.xul
mailnews/base/prefs/content/am-copies.inc.xul
mailnews/base/prefs/content/am-junk.xul
mailnews/base/prefs/content/am-server-advanced.xul
mailnews/base/prefs/content/am-server.xul
mailnews/extensions/newsblog/content/feed-subscriptions.xul
--- a/mailnews/base/content/newFolderDialog.xul
+++ b/mailnews/base/content/newFolderDialog.xul
@@ -19,17 +19,16 @@
         onload="onLoad();"
         buttonlabelaccept="&accept.label;"
         buttonaccesskeyaccept="&accept.accesskey;">
 
   <stringbundleset id="stringbundleset"/>
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/newFolderDialog.js"/>
-  <script src="chrome://messenger/content/folder-menupopup.js"/>
 
     <label id="nameLabel" value="&name.label;" accesskey="&name.accesskey;"
            control="name"/>
     <html:input id="name"
                 type="text"
                 class="input-inline"
                 aria-labelledby="nameLabel"
                 oninput="doEnabling();"/>
--- a/mailnews/base/content/newmailalert.xul
+++ b/mailnews/base/content/newmailalert.xul
@@ -10,17 +10,16 @@
 <window id="newMailAlertNotification"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         windowtype="alert:alert"
         role="alert"
         align="start"
         onload="onAlertLoad()">
 
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <script src="chrome://messenger/content/foldersummary.js"/>
   <script src="chrome://messenger/content/newmailalert.js"/>
 
   <stack id="alertContainer" mousethrough="always">
     <hbox id="alertBox">
       <hbox id ="alertImageBox" align="center" pack="center">
         <image id="alertImage"/>
       </hbox>
 
--- a/mailnews/base/content/subscribe.xul
+++ b/mailnews/base/content/subscribe.xul
@@ -20,17 +20,16 @@
         windowtype="mailnews:subscribe">
 
   <stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://messenger/content/mailWindow.js"/>
   <script src="chrome://messenger/content/subscribe.js"/>
-  <script src="chrome://messenger/content/folder-menupopup.js"/>
 
   <vbox flex="1" style="width: 40em; height: 25em;">
     <hbox>
       <vbox>
         <hbox pack="end" align="center" flex="1">
           <label value="&server.label;"
                  accesskey="&server.accesskey;"
                  control="serverMenu"/>
--- a/mailnews/base/prefs/content/am-copies.inc.xul
+++ b/mailnews/base/prefs/content/am-copies.inc.xul
@@ -1,14 +1,13 @@
 # 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/.
 
   <vbox flex="1" id="copiesAndFolders">
-    <script src="chrome://messenger/content/folder-menupopup.js"/>
     <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     </stringbundleset>
 
     <label id="identity.fccFolder" hidden="true" wsm_persist="true"
            pref="true" preftype="string" prefattribute="value"
            prefstring="mail.identity.%identitykey%.fcc_folder"/>
     <label id="identity.draftFolder" hidden="true" wsm_persist="true"
--- a/mailnews/base/prefs/content/am-junk.xul
+++ b/mailnews/base/prefs/content/am-junk.xul
@@ -20,17 +20,16 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&junkSettings.label;"
         onload="parent.onPanelLoaded('am-junk.xul');">
 
   <vbox flex="1" style="overflow: auto;">
     <script src="chrome://messenger/content/am-junk.js"/>
     <script src="chrome://messenger/content/am-prefs.js"/>
     <script src="chrome://messenger/content/amUtils.js"/>
-    <script src="chrome://messenger/content/folder-menupopup.js"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&junkSettings.label;"/>
     </hbox>
 
     <groupbox>
       <label class="header">&junkClassification.label;</label>
--- a/mailnews/base/prefs/content/am-server-advanced.xul
+++ b/mailnews/base/prefs/content/am-server-advanced.xul
@@ -15,17 +15,16 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&serverAdvanced.label;"
         buttons="accept,cancel"
         onload="onLoad();">
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/am-server-advanced.js"/>
-  <script src="chrome://messenger/content/folder-menupopup.js"/>
   <stringbundle id="bundle_prefs"
                 src="chrome://messenger/locale/prefs.properties"/>
 
     <label id="serverPrettyName"/>
 
     <separator class="thin"/>
 
     <!-- IMAP Panel -->
--- a/mailnews/base/prefs/content/am-server.xul
+++ b/mailnews/base/prefs/content/am-server.xul
@@ -22,17 +22,16 @@
 
   <vbox flex="1" style="overflow: auto;">
     <script src="chrome://global/content/globalOverlay.js"/>
     <script src="chrome://global/content/editMenuOverlay.js"/>
     <script src="chrome://messenger/content/am-server.js"/>
     <script src="chrome://messenger/content/am-prefs.js"/>
     <script src="chrome://messenger/content/amUtils.js"/>
     <script src="chrome://messenger/content/menulist-charsetpicker.js"/>
-    <script src="chrome://messenger/content/folder-menupopup.js"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
     <label hidden="true" wsm_persist="true" id="server.type"/>
     <label hidden="true"
            wsm_persist="true"
            preftype="string"
            prefattribute="value"
            prefstring="mail.server.%serverkey%.storeContractID"
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xul
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xul
@@ -29,17 +29,16 @@
         onclose="return FeedSubscriptions.onClose();"
         onkeypress="FeedSubscriptions.onKeyPress(event);"
         onmousedown="FeedSubscriptions.onMouseDown(event);">
 
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://messenger/content/specialTabs.js"/>
   <script src="chrome://messenger-newsblog/content/feed-subscriptions.js"/>
-  <script src="chrome://messenger/content/folder-menupopup.js"/>
 
   <linkset>
     <html:link rel="localization" href="security/certificates/certManager.ftl"/>
   </linkset>
 
   <keyset id="extensionsKeys">
     <key id="key_close"
          key="&cmd.close.commandKey;"