Bug 520899 - Switch application/x-javascript to application/javascript, MailNews Core part; (Av1) All .xul files.

r+sr=standard8.
2009-12-03 15:01:32 +01:00 · 2009-12-03 15:01:32 +01:00 · 0c50b439c0
--- a/mailnews/addrbook/content/abAddressBookNameDialog.xul
+++ b/mailnews/addrbook/content/abAddressBookNameDialog.xul
@ -50,7 +50,7 @@
                  src="chrome://messenger/locale/addressbook/addressBook.properties"/>
  </stringbundleset>

-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>

  <hbox align="center">
    <label control="name" value="&name.label;" accesskey="&name.accesskey;"/>
--- a/mailnews/addrbook/content/abCardOverlay.xul
+++ b/mailnews/addrbook/content/abCardOverlay.xul
@ -49,8 +49,8 @@
  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 </stringbundleset>

-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCardOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abCardOverlay.js"/>

 <vbox id="editcard">
  <tabbox>
--- a/mailnews/addrbook/content/abCardViewOverlay.xul
+++ b/mailnews/addrbook/content/abCardViewOverlay.xul
@ -43,7 +43,7 @@
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>

  <vbox id="CardViewBox" flex="1">
  
--- a/mailnews/addrbook/content/abDirTreeOverlay.xul
+++ b/mailnews/addrbook/content/abDirTreeOverlay.xul
@ -44,8 +44,8 @@
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>

  <!-- FIX ME - remove document.commandDispatcher.updateCommands() when tree selection calls this automatically -->
  <tree id="dirTree" class="abDirectory plain" seltype="single"
--- a/mailnews/addrbook/content/abListOverlay.xul
+++ b/mailnews/addrbook/content/abListOverlay.xul
@ -47,10 +47,10 @@
  <stringbundleset id="stringbundleset">
    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
  </stringbundleset>
-  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
+  <script type="application/javascript" src="chrome://global/content/dialogOverlay.js"/>

 <vbox id="editlist">
  <vbox>
--- a/mailnews/addrbook/content/abResultsPaneOverlay.xul
+++ b/mailnews/addrbook/content/abResultsPaneOverlay.xul
@ -44,9 +44,9 @@
 <overlay
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>

 <tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain focusring"
    onclick="AbResultsPaneOnClick(event);"
--- a/mailnews/addrbook/content/abSelectAddressesDialog.xul
+++ b/mailnews/addrbook/content/abSelectAddressesDialog.xul
@ -63,11 +63,11 @@

  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
  <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>


  <keyset id="dialogKeys"/>
--- a/mailnews/addrbook/content/addressbook-panel.xul
+++ b/mailnews/addrbook/content/addressbook-panel.xul
@ -62,12 +62,12 @@
    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
  </stringbundleset>

-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/addressbook-panel.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook-panel.js"/>

  <commandset id="addressbook-panel-commandset">
    <command id="cmd_newlist" oncommand="AbNewList();"/>
--- a/mailnews/addrbook/prefs/content/pref-directory-add.xul
+++ b/mailnews/addrbook/prefs/content/pref-directory-add.xul
@ -53,7 +53,7 @@
        ondialogaccept="return onAccept();"
        ondialogcancel="return onCancel();">

-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory-add.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/pref-directory-add.js"/>
  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
  <stringbundle id="bundle_replication" src="chrome://messenger/locale/addressbook/replicationProgress.properties"/>

--- a/mailnews/addrbook/prefs/content/pref-editdirectories.xul
+++ b/mailnews/addrbook/prefs/content/pref-editdirectories.xul
@ -49,9 +49,9 @@
        onload="onInitEditDirectories();"
        onunload="onUninitEditDirectories();">

-  <script type="application/x-javascript"
+  <script type="application/javascript"
          src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
          src="chrome://messenger/content/addressbook/pref-editdirectories.js"/>

  <stringbundle id="bundle_addressBook"
--- a/mailnews/base/content/folderProps.xul
+++ b/mailnews/base/content/folderProps.xul
@ -54,10 +54,10 @@
  ondialogaccept="return folderPropsOKButton();">
 
  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/retention.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/folderProps.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/retention.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/folderProps.js"/>
+  <script type="application/javascript">
  <![CDATA[
    var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
    observerService.notifyObservers(null, "charsetmenu-selected", "other");
--- a/mailnews/base/content/junkLog.xul
+++ b/mailnews/base/content/junkLog.xul
@ -56,7 +56,7 @@
        persist="screenX screenY width height"
        style="width: 40em; height: 25em;">

-  <script type="application/x-javascript" src="chrome://messenger/content/junkLog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/junkLog.js"/>

  <vbox flex="1">
    <hbox>
--- a/mailnews/base/content/markByDate.xul
+++ b/mailnews/base/content/markByDate.xul
@ -48,8 +48,8 @@
  onload="onLoad();"
  ondialogaccept="return onAccept();">

-  <script type="application/x-javascript" src="chrome://messenger/content/markByDate.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/dateFormat.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/markByDate.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/dateFormat.js"/>

  <hbox align="center" pack="end">
    <label control="lowerDate"
--- a/mailnews/base/content/msgAccountCentral.xul
+++ b/mailnews/base/content/msgAccountCentral.xul
@ -55,14 +55,14 @@
  <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/msgAccountCentral.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/msgAccountCentral.js"/>

  <grid id="acctCentralGrid" flex="1" style="overflow: auto;"> 
    <columns id="acctCentralColumns">
--- a/mailnews/base/content/msgSynchronize.xul
+++ b/mailnews/base/content/msgSynchronize.xul
@ -51,7 +51,7 @@
        style="width: 35em;"
        ondialogaccept="return syncOkButton();">

-<script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgSynchronize.js"/>

    <keyset id="keyset"/>
    <label hidden="true" wsm_persist="true" id="server.type"/>
--- a/mailnews/base/content/newFolderDialog.xul
+++ b/mailnews/base/content/newFolderDialog.xul
@ -54,7 +54,7 @@
        ondialogaccept="return onOK();">

  <stringbundleset id="stringbundleset"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/newFolderDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/newFolderDialog.js"/>

    <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
    <textbox id="name" oninput="doEnabling();"/>
--- a/mailnews/base/content/renameFolderDialog.xul
+++ b/mailnews/base/content/renameFolderDialog.xul
@ -48,7 +48,7 @@
        onload="onLoad();">

  <stringbundleset id="stringbundleset"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/renameFolderDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/renameFolderDialog.js"/>

  <label value="&rename.label;" accesskey="&rename.accesskey;" control="name"/>
  <textbox id="name" oninput="doEnabling();"/>
--- a/mailnews/base/content/shutdownWindow.xul
+++ b/mailnews/base/content/shutdownWindow.xul
@ -46,7 +46,7 @@
        buttons="cancel"
        ondialogcancel="return onCancel();">

-  <script type="application/x-javascript" src="chrome://messenger/content/shutdownWindow.js"></script>
+  <script type="application/javascript" src="chrome://messenger/content/shutdownWindow.js"></script>
  <stringbundle id="bundle_shutdown" src="chrome://messenger/locale/shutdownWindow.properties"/>
  
  <vbox align="center">
--- a/mailnews/base/content/virtualFolderListDialog.xul
+++ b/mailnews/base/content/virtualFolderListDialog.xul
@ -55,8 +55,8 @@
        ondialogaccept="return onOK();"
        ondialogcancel="return onCancel();">   

-<script type="application/x-javascript" src="chrome://messenger/content/virtualFolderListDialog.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/virtualFolderListDialog.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>

  <label control="folderPickerTree">&virtualFolderDesc.label;</label>

--- a/mailnews/base/content/virtualFolderProperties.xul
+++ b/mailnews/base/content/virtualFolderProperties.xul
@ -65,10 +65,10 @@
    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
  </stringbundleset>

-  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/virtualFolderProperties.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/virtualFolderProperties.js"/>

  <keyset id="dialogKeys"/>
   
--- a/mailnews/base/prefs/content/AccountManager.xul
+++ b/mailnews/base/prefs/content/AccountManager.xul
@ -15,11 +15,11 @@
        ondialogaccept="return onAccept();">
 <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-<script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/am-help.js"/>
+<script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+<script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+<script type="application/javascript" src="chrome://messenger/content/am-help.js"/>

  <hbox flex="1">
    <vbox style="&accountTree.width;">
--- a/mailnews/base/prefs/content/AccountWizard.xul
+++ b/mailnews/base/prefs/content/AccountWizard.xul
@ -50,16 +50,16 @@

  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountWizard.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/ispUtils.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-accounttype.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-identity.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-server.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-login.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-accname.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-done.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountWizard.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/ispUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-accounttype.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-identity.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-server.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-login.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-accname.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-done.js"/>

  <!-- Account Type page : Displays choices of mail and news accounts that user can create -->
  <wizardpage id="accounttype" pageid="accounttype"
--- a/mailnews/base/prefs/content/SmtpServerEdit.xul
+++ b/mailnews/base/prefs/content/SmtpServerEdit.xul
@ -52,7 +52,7 @@
        ondialogaccept="return onAccept();">
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
 <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-<script type="application/x-javascript" src="amUtils.js"/>
-<script type="application/x-javascript" src="SmtpServerEdit.js"/>
+<script type="application/javascript" src="amUtils.js"/>
+<script type="application/javascript" src="SmtpServerEdit.js"/>
 <vbox id="smtpServerEditor"/>
 </dialog>
--- a/mailnews/base/prefs/content/am-addressingOverlay.xul
+++ b/mailnews/base/prefs/content/am-addressingOverlay.xul
@ -44,7 +44,7 @@
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">                                                       

-  <script type="application/x-javascript" src="chrome://messenger/content/am-addressing.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-addressing.js"/>

  <vbox flex="1" id="compositionAndAddressing">
    <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
--- a/mailnews/base/prefs/content/am-copies.xul
+++ b/mailnews/base/prefs/content/am-copies.xul
@ -8,7 +8,7 @@
      title="&copyAndFolderTitle.label;"
      onload="parent.onPanelLoaded('am-copies.xul');">

-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
  
  <dialogheader title="&copyAndFolderTitle.label;"/>
  <vbox id="copiesAndFolders"/>
--- a/mailnews/base/prefs/content/am-copiesOverlay.xul
+++ b/mailnews/base/prefs/content/am-copiesOverlay.xul
@ -49,8 +49,8 @@
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">                                                       

-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-copies.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-copies.js"/>

  <vbox flex="1" id="copiesAndFolders">  
    <!-- stringbundle is used by msgFolderPickerOverlay.js-->     
--- a/mailnews/base/prefs/content/am-identities-list.xul
+++ b/mailnews/base/prefs/content/am-identities-list.xul
@ -50,7 +50,7 @@
  style="width: 40em;">

 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-<script type="application/x-javascript" src="am-identities-list.js"/>
+<script type="application/javascript" src="am-identities-list.js"/>

 <label control="identitiesList" flex="1">&identitiesListDesc.label;</label>

--- a/mailnews/base/prefs/content/am-identity-edit.xul
+++ b/mailnews/base/prefs/content/am-identity-edit.xul
@ -59,9 +59,9 @@
  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>

-  <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
-  <script type="application/x-javascript" src="am-identity-edit.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+  <script type="application/javascript" src="am-identity-edit.js"/>
+  <script type="application/javascript">
  <![CDATA[
    function getServerIdAndPageIdFromTree(tree)
    {
--- a/mailnews/base/prefs/content/am-junk.xul
+++ b/mailnews/base/prefs/content/am-junk.xul
@ -55,11 +55,11 @@
      title="&junkSettings.label;"
      onload="parent.onPanelLoaded('am-junk.xul');">

-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-junk.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-junk.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
  
  <dialogheader title="&junkSettings.label;"/>
--- a/mailnews/base/prefs/content/am-main.xul
+++ b/mailnews/base/prefs/content/am-main.xul
@ -10,9 +10,9 @@
    <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>

-    <script type="application/x-javascript" src="chrome://messenger/content/am-identity-edit.js"/>
-    <script type="application/x-javascript" src="chrome://messenger/content/am-main.js"/>
-    <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/am-identity-edit.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/am-main.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>

    <broadcaster id="broadcaster_attachSignature"/>

--- a/mailnews/base/prefs/content/am-offline.xul
+++ b/mailnews/base/prefs/content/am-offline.xul
@ -49,9 +49,9 @@

    <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/> 

-    <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="application/x-javascript" src="chrome://messenger/content/retention.js"/>
-    <script type="application/x-javascript" src="chrome://messenger/content/am-offline.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/retention.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/am-offline.js"/>

    <label hidden="true" wsm_persist="true" id="server.type"/>  
    <label id="imap.autoSyncMaxAgeDays" hidden="true"
--- a/mailnews/base/prefs/content/am-server-advanced.xul
+++ b/mailnews/base/prefs/content/am-server-advanced.xul
@ -50,7 +50,7 @@
        onload="onLoad();"
        ondialogaccept="return onOk();">

-  <script type="application/x-javascript" src="am-server-advanced.js"/>
+  <script type="application/javascript" src="am-server-advanced.js"/>
  <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>

    <!-- IMAP Panel -->
--- a/mailnews/base/prefs/content/am-server.xul
+++ b/mailnews/base/prefs/content/am-server.xul
@ -55,11 +55,11 @@
      title="&serverSettings.label;"
      onload="parent.onPanelLoaded('am-server.xul');">

-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-server.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-server.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>

  <label hidden="true" wsm_persist="true" id="server.type"/>
--- a/mailnews/base/prefs/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/content/am-serverwithnoidentities.xul
@ -8,8 +8,8 @@
      title="&accountTitle.label;"
      onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');">

-  <script type="application/x-javascript" src="chrome://messenger/content/am-serverwithnoidentities.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-serverwithnoidentities.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>

  <dialogheader title="&accountTitle.label;"/>

--- a/mailnews/base/prefs/content/am-smtp.xul
+++ b/mailnews/base/prefs/content/am-smtp.xul
@ -9,8 +9,8 @@
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      title="&smtpServer.label;"
      onload="gSmtpServerListWindow.onLoad();">
-  <script type="application/x-javascript" src="amUtils.js"/>
-  <script type="application/x-javascript" src="am-smtp.js"/>
+  <script type="application/javascript" src="amUtils.js"/>
+  <script type="application/javascript" src="am-smtp.js"/>
  
  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>

--- a/mailnews/base/search/content/CustomHeaders.xul
+++ b/mailnews/base/search/content/CustomHeaders.xul
@ -53,7 +53,7 @@
  <stringbundle id="bundle_custom" src="chrome://messenger/locale/custom.properties"/>
  </stringbundleset>

-  <script type="application/x-javascript" src="chrome://messenger/content/CustomHeaders.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/CustomHeaders.js"/>

  <!-- we need to override the dialogs default key behavior so we can re-route enter/return
       to the add button if the add button is suddenly the default action
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@ -64,11 +64,11 @@
    <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
  </stringbundleset>

-  <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/FilterEditor.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/FilterEditor.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>

  <hbox align="center">
    <label value="&filterName.label;" accesskey="&filterName.accesskey;" control="filterName"/>
--- a/mailnews/base/search/content/viewLog.xul
+++ b/mailnews/base/search/content/viewLog.xul
@ -53,7 +53,7 @@
        persist="screenX screenY width height"
        style="width: 40em; height: 25em;">

-  <script type="application/x-javascript" src="chrome://messenger/content/viewLog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/viewLog.js"/>

  <vbox flex="1">
    <description>&viewLogInfo.text;</description>
--- a/mailnews/compose/content/MsgAttachPage.xul
+++ b/mailnews/compose/content/MsgAttachPage.xul
@ -53,8 +53,8 @@
        persist="screenX screenY"
        screenX="24" screenY="24">

-  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>

  <stringbundle id="attachWebPageBundle" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>

--- a/mailnews/compose/content/mailComposeEditorOverlay.xul
+++ b/mailnews/compose/content/mailComposeEditorOverlay.xul
@ -41,7 +41,7 @@
 <overlay id="mailComposeEditorOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/x-javascript">
+  <script type="application/javascript">
  <![CDATA[

    var gMsgCompProcessLink = false;
--- a/mailnews/compose/content/sendProgress.xul
+++ b/mailnews/compose/content/sendProgress.xul
@ -53,7 +53,7 @@
        buttons="cancel"
        ondialogcancel="return onCancel();">

-  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/sendProgress.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messengercompose/sendProgress.js"/>
  <stringbundle id="sendProgressStringBundle" src="chrome://messenger/locale/messengercompose/sendProgress.properties"/>

    <grid flex="1">
--- a/mailnews/extensions/dsn/content/am-dsn.xul
+++ b/mailnews/extensions/dsn/content/am-dsn.xul
@ -47,8 +47,8 @@
      onload="parent.onPanelLoaded('am-dsn.xul');">

  <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-dsn.properties"/> 
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-dsn.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-dsn.js"/>
  
  <dialogheader title="&pane.title;"/>

--- a/mailnews/extensions/mdn/content/am-mdn.xul
+++ b/mailnews/extensions/mdn/content/am-mdn.xul
@ -46,8 +46,8 @@
    onload="parent.onPanelLoaded('am-mdn.xul');">

  <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-mdn.properties"/> 
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-mdn.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-mdn.js"/>
  
  <dialogheader title="&pane.title;"/>

--- a/mailnews/extensions/newsblog/content/am-newsblog.xul
+++ b/mailnews/extensions/newsblog/content/am-newsblog.xul
@ -48,11 +48,11 @@
      title="&accountTitle.label;"
      onload="parent.onPanelLoaded('am-newsblog.xul');">

-  <script type="application/x-javascript"
+  <script type="application/javascript"
          src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
          src="chrome://messenger-newsblog/content/am-newsblog.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
          src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>

  <dialogheader id="am-newsblog-title" defaultTitle="&accountTitle.label;"/>
--- a/mailnews/extensions/newsblog/content/feed-properties.xul
+++ b/mailnews/extensions/newsblog/content/feed-properties.xul
@ -55,9 +55,9 @@
  onload="onLoad();"
  ondialogaccept="return onOk();">

-  <script type="application/x-javascript" src="feed-properties.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="feed-properties.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>

  <popup id="copyUrlPopup" popupanchor="bottomleft">
    <menuitem label="&copyLinkCmd.label;" accesskey="&copyLinkCmd.accesskey;"
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xul
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xul
@ -56,14 +56,14 @@
        windowtype="Mail:News-BlogSubscriptions"
        flex="1">

-  <script type="application/x-javascript" src="utils.js"/>
-  <script type="application/x-javascript" src="file-utils.js"/>
-  <script type="application/x-javascript" src="debug-utils.js"/>
-  <script type="application/x-javascript" src="feed-subscriptions.js"/>
-  <script type="application/x-javascript" src="Feed.js"/>
-  <script type="application/x-javascript" src="FeedItem.js"/>
-  <script type="application/x-javascript" src="feed-parser.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="utils.js"/>
+  <script type="application/javascript" src="file-utils.js"/>
+  <script type="application/javascript" src="debug-utils.js"/>
+  <script type="application/javascript" src="feed-subscriptions.js"/>
+  <script type="application/javascript" src="Feed.js"/>
+  <script type="application/javascript" src="FeedItem.js"/>
+  <script type="application/javascript" src="feed-parser.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>

  <keyset id="extensionsKeys">
    <key id="key_close"   key="&cmd.close.commandKey;" modifiers="accel" oncommand="window.close();"/>
--- a/mailnews/extensions/smime/content/am-smime.xul
+++ b/mailnews/extensions/smime/content/am-smime.xul
@ -49,8 +49,8 @@
        onload="parent.onPanelLoaded('am-smime.xul');"
        ondialogaccept="smimeOnAcceptEditor();">

-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-smime.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-smime.js"/>

  <dialogheader title="&securityTitle.label;"/>

--- a/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul
+++ b/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul
@ -54,9 +54,9 @@
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/x-javascript"
+  <script type="application/javascript"
          src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
          src="chrome://messenger/content/am-smime.js"/>

  <tabs id="identitySettings">
@ -67,7 +67,7 @@
    <vbox flex="1" name="smimeEditingContent" id="smimeEditing"/>
  </tabpanels>

-  <script type="application/x-javascript">
+  <script type="application/javascript">
  <![CDATA[
    window.addEventListener("load", smimeOnLoadEditor, false);
  ]]>
--- a/mailnews/extensions/smime/content/certFetchingStatus.xul
+++ b/mailnews/extensions/smime/content/certFetchingStatus.xul
@ -49,7 +49,7 @@
  onload="onLoad();">

  <stringbundle id="bundle_ldap" src="chrome://mozldap/locale/ldap.properties"/>
-<script type="application/x-javascript" src="chrome://messenger-smime/content/certFetchingStatus.js"/>
+<script type="application/javascript" src="chrome://messenger-smime/content/certFetchingStatus.js"/>

  <description>&info.message;</description>

--- a/mailnews/extensions/smime/content/msgCompSecurityInfo.xul
+++ b/mailnews/extensions/smime/content/msgCompSecurityInfo.xul
@ -47,7 +47,7 @@
  buttons="accept"
  onload="onLoad();">

-  <script type="application/x-javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>
+  <script type="application/javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>

  <stringbundle id="bundle_smime_comp_info" src="chrome://messenger-smime/locale/msgCompSecurityInfo.properties"/> 

--- a/mailnews/extensions/smime/content/msgReadSecurityInfo.xul
+++ b/mailnews/extensions/smime/content/msgReadSecurityInfo.xul
@ -46,7 +46,7 @@
  buttons="accept"
  onload="onLoad();">

-  <script type="application/x-javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>
+  <script type="application/javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>

  <stringbundle id="bundle_smime_read_info" src="chrome://messenger-smime/locale/msgSecurityInfo.properties"/> 

--- a/mailnews/import/content/fieldMapImport.xul
+++ b/mailnews/import/content/fieldMapImport.xul
@ -47,7 +47,7 @@
        ondialogaccept="FieldImportOKButton();"
        onload="OnLoadFieldMapImport();">

-  <script type="application/x-javascript" src="chrome://messenger/content/fieldMapImport.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/fieldMapImport.js"/>

  <hbox align="center">
    <label value="&fieldMapImport.recordNumber;"/>
--- a/mailnews/import/content/importDialog.xul
+++ b/mailnews/import/content/importDialog.xul
@ -60,7 +60,7 @@

  <stringbundle id="bundle_importMsgs" src="chrome://messenger/locale/importMsgs.properties"/>
  <stringbundle id="bundle_addressbook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/importDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/importDialog.js"/>

  <keyset id="dialogKeys"/>
  
--- a/mailnews/news/content/downloadheaders.xul
+++ b/mailnews/news/content/downloadheaders.xul
@ -49,7 +49,7 @@
        onload="OnLoad();">

  <stringbundle id="bundle_news" src="chrome://messenger/locale/news.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/downloadheaders.js" />
+  <script type="application/javascript" src="chrome://messenger/content/downloadheaders.js" />

  <label class="header" style="width: 25em; max-width: 25em;" id="newsgroupLabel" control="downloadGroup"/> 
  <description style="width: 25em; max-width: 25em;" id="info" control="downloadGroup"/>