--- a/mail/base/content/ABSearchDialog.xul
+++ b/mail/base/content/ABSearchDialog.xul
@@ -63,24 +63,24 @@
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
<stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
</stringbundleset>
- <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.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://global/content/globalOverlay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/ABSearchDialog.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+ <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.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://global/content/globalOverlay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/ABSearchDialog.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
<keyset id="mailKeys">
<key key="&closeCmd.key;" modifiers="accel" oncommand="onSearchStop(); closeWindow(true);"/>
<key keycode="VK_ESCAPE" oncommand="onSearchStop(); closeWindow(true);"/>
</keyset>
<dummy class="usesMailWidgets"/>
--- a/mail/base/content/FilterListDialog.xul
+++ b/mail/base/content/FilterListDialog.xul
@@ -53,17 +53,17 @@
windowtype="mailnews:filterlist"
style="width: 45em; height: 31em;"
onload="onLoad();"
onunload="onFilterUnload();"
onclose="return onFilterClose();"
persist="width height screenX screenY"
title="&window.title;">
- <script type="application/x-javascript" src="chrome://messenger/content/FilterListDialog.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/FilterListDialog.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
</stringbundleset>
<keyset id="dialogKeys"/>
<keyset>
<key key="&closeCmd.key;" modifiers="accel" oncommand="if (onFilterClose()) window.close();"/>
--- a/mail/base/content/SearchDialog.xul
+++ b/mail/base/content/SearchDialog.xul
@@ -53,30 +53,30 @@
title="&searchDialogTitle.label;"
style="width: 52em; height: 34em;"
persist="screenX screenY width height sizemode">
<stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
- <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/folderDisplay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/messageDisplay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/threadPane.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
- <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/SearchDialog.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/messageDisplay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/threadPane.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+ <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/SearchDialog.js"/>
<!-- We need this for a SetFolderPicker call, until we de-rdfify this file -->
- <script type="application/x-javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
<commands id="commands">
<commandset id="mailSearchItems"
commandupdater="true"
events="mail-search"
oncommandupdate="goUpdateSearchItems(this)">
<command id="cmd_open" oncommand="goDoCommand('cmd_open')" disabled="true"/>
<command id="button_delete" oncommand="goDoCommand('button_delete')" disabled="true"/>
--- a/mail/base/content/aboutDialog.xul
+++ b/mail/base/content/aboutDialog.xul
@@ -52,17 +52,17 @@
#ifdef XP_MACOSX
buttons="extra2" align="end"
#else
buttons="accept,extra2"
#endif
onload="onLoad();" onunload="onUnload(event);"
title="&aboutDialog.title;">
- <script type="application/x-javascript"
+ <script type="application/javascript"
src="chrome://messenger/content/aboutDialog.js"/>
<deck id="modes" flex="1">
<vbox flex="1" id="clientBox">
#expand <label id="versionField" value="&aboutVersion; __MOZ_APP_VERSION__"/>
<description id="copyright">©rightText;</description>
<textbox id="userAgent" multiline="true" readonly="true" flex="1"/>
</vbox>
--- a/mail/base/content/aboutRights.xhtml
+++ b/mail/base/content/aboutRights.xhtml
@@ -92,17 +92,17 @@
<li>&rights.webservices-term5;</li>
<li>&rights.webservices-term6;</li>
#else
<li>&rights.webservices-term1-unbranded;</li>
#endif
</ol>
</div>
-<script type="application/x-javascript"><![CDATA[
+<script type="application/javascript"><![CDATA[
var servicesDiv = document.getElementById("webservices-container");
servicesDiv.style.display = "none";
function showServices(event) {
servicesDiv.style.display = "";
event.preventDefault();
}
]]></script>
--- a/mail/base/content/baseMenuOverlay.xul
+++ b/mail/base/content/baseMenuOverlay.xul
@@ -41,20 +41,20 @@
%brandDTD;
<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://messenger/locale/baseMenuOverlay.dtd">
%baseMenuOverlayDTD;
]>
<overlay id="baseMenuOverlay"
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"
+ <script type="application/javascript"
src="chrome://communicator/content/utilityOverlay.js"/>
- <script type="application/x-javascript"
+ <script type="application/javascript"
src="chrome://messenger/content/mailCore.js"/>
#ifdef XP_WIN
<menu id="helpMenu"
label="&helpMenuWin.label;" accesskey="&helpMenuWin.accesskey;">
#else
<menu id="helpMenu"
label="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
--- a/mail/base/content/credits.xhtml
+++ b/mail/base/content/credits.xhtml
@@ -150,18 +150,18 @@
list-style-type: none;
}
.center {
text-align: center;
}
</style>
- <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
- <script type="application/x-javascript">
+ <script type="application/javascript" src="chrome://global/content/globalOverlay.js"></script>
+ <script type="application/javascript">
<![CDATA[
var gCreditsInterval = -1;
function uninit()
{
if (gCreditsInterval > -1)
clearInterval(gCreditsInterval);
--- a/mail/base/content/customizeToolbarOverlay.xul
+++ b/mail/base/content/customizeToolbarOverlay.xul
@@ -41,17 +41,17 @@
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<overlay id="CustomizeToolbarWindowOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/x-javascript"
+ <script type="application/javascript"
src="chrome://messenger/content/mailCore.js"/>
<menulist id="modelist"
oncommand="overlayUpdateToolbarMode(this.value, 'mail-toolbox');"/>
<window id="CustomizeToolbarWindow"
onload="overlayOnLoad();">
<data id="iconsBesideText.label"
--- a/mail/base/content/hiddenWindow.xul
+++ b/mail/base/content/hiddenWindow.xul
@@ -54,23 +54,23 @@
]>
<window id="hidden-window"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="hiddenWindowStartup();">
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/shareglue.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/mail3PaneWindowCommands.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/searchBar.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/hiddenWindow.js"/>
+<script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/shareglue.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/mail3PaneWindowCommands.js"/>
+<script type="application/javascript" src="chrome://messenger/content/searchBar.js"/>
+<script type="application/javascript" src="chrome://messenger/content/hiddenWindow.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
<stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
</stringbundleset>
--- a/mail/base/content/mailOverlay.xul
+++ b/mail/base/content/mailOverlay.xul
@@ -1,15 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
<overlay id="mailOverlay.xul"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/x-javascript">
+ <script type="application/javascript">
<![CDATA[
function openNewCardDialog()
{
window.openDialog("chrome://messenger/content/addressbook/abNewCardDialog.xul",
"", "chrome,modal,resizable=no,centerscreen");
}
function goOpenNewMessage()
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -52,27 +52,27 @@
<!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
%msgViewPickerDTD;
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
]>
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/junkCommands.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailTabs.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/messageDisplay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/folderDisplay.js"/>
-<script type="application/x-javascript" src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
-<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
-<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
+<script type="application/javascript" src="chrome://messenger/content/junkCommands.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailTabs.js"/>
+<script type="application/javascript" src="chrome://messenger/content/messageDisplay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
+<script type="application/javascript" src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mail-offline.js"/>
+<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
+<script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
</stringbundleset>
<!-- Performance optimization...we include utilityOverlay.xul which defines some command sets
which are updated based on events like focus and select. We have our own custom events
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@@ -70,32 +70,32 @@
windowtype="mail:messageWindow">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
<stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
</stringbundleset>
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/shareglue.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/folderDisplay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/messageDisplay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/messageWindow.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
- <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/nsContextMenu.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/mailContextMenus.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/phishingDetector.js"/>
- <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
- <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/editContactOverlay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/messageDisplay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/messageWindow.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+ <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/nsContextMenu.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/phishingDetector.js"/>
+ <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+ <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/editContactOverlay.js"/>
<commandset id="mailCommands">
<commandset id="mailFileMenuItems"/>
<commandset id="mailViewMenuItems"/>
<commandset id="mailEditMenuItems"/>
<commandset id="mailSearchMenuItems"/>
<commandset id="mailGoMenuItems"/>
<commandset id="mailMessageMenuItems"/>
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -92,40 +92,40 @@
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
<stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
<stringbundle id="bundle_multimessages" src="chrome://messenger/locale/multimessageview.properties"/>
</stringbundleset>
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/shareglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/selectionsummaries.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/specialTabs.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/glodaFacetTab.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/searchBar.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
-<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/nsContextMenu.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailContextMenus.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/folderPane.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/phishingDetector.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/editContactOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
+<script type="application/javascript" src="chrome://messenger/content/selectionsummaries.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+<script type="application/javascript" src="chrome://messenger/content/specialTabs.js"/>
+<script type="application/javascript" src="chrome://messenger/content/glodaFacetTab.js"/>
+<script type="application/javascript" src="chrome://messenger/content/searchBar.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
+<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/nsContextMenu.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
+<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/folderPane.js"/>
+<script type="application/javascript" src="chrome://messenger/content/phishingDetector.js"/>
+<script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/editContactOverlay.js"/>
<!-- move needed functions into a single js file -->
-<script type="application/x-javascript" src="chrome://messenger/content/threadPane.js"/>
+<script type="application/javascript" src="chrome://messenger/content/threadPane.js"/>
<commandset id="mailCommands">
<commandset id="mailFileMenuItems"/>
<commandset id="mailViewMenuItems"/>
<commandset id="mailEditMenuItems"/>
<commandset id="mailEditContextMenuItems"/>
<commandset id="mailSearchMenuItems"/>
<commandset id="mailGoMenuItems"/>
--- a/mail/base/content/msgPrintEngine.xul
+++ b/mail/base/content/msgPrintEngine.xul
@@ -50,15 +50,15 @@
persist="width height screenX screenY sizemode"
windowtype="mail:printEngine">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
</stringbundleset>
- <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
+ <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
<script src="chrome://messenger/content/msgPrintEngine.js"/>
<!-- The main display frame -->
<browser id="content" type="content-primary" name="content" src="about:blank" flex="1" disablehistory="true" disablesecurity="true"/>
</window>
--- a/mail/base/content/msgSelectOffline.xul
+++ b/mail/base/content/msgSelectOffline.xul
@@ -49,17 +49,17 @@
persist="width height"
onload="selectOnLoad();"
ondialogaccept="return selectOkButton();"
ondialogcancel="return selectCancelButton();">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
- <script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/msgSynchronize.js"/>
<label class="desc" control="synchronizeTree">&MsgSelectDesc.label;</label>
<tree id="synchronizeTree"
treelines="true"
flex="1"
hidecolumnpicker="true"
datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
--- a/mail/base/content/multimessageview.xhtml
+++ b/mail/base/content/multimessageview.xhtml
@@ -54,17 +54,17 @@
<head>
<link rel="stylesheet" media="screen" type="text/css"
href="chrome://messenger/skin/messageHeader.css"/>
<link rel="stylesheet" media="screen" type="text/css"
href="chrome://messenger/skin/multimessageview.css"/>
<link rel="stylesheet" media="screen" type="text/css"
href="chrome://messenger/skin/tagColors.css"/>
<title>&window.title;</title>
- <script type="application/x-javascript;version=1.8"><![CDATA[
+ <script type="application/javascript;version=1.8"><![CDATA[
Components.utils.import("resource://app/modules/errUtils.js");
function adjustHeadingSize() {
let content = document.getElementById('content');
let heading = document.getElementById('heading');
let buttonbox = document.getElementById('buttonbox');
content.style.top = Math.max(
buttonbox.getBoundingClientRect().height,
heading.getBoundingClientRect().height) + 'px';
--- a/mail/base/content/newTagDialog.xul
+++ b/mail/base/content/newTagDialog.xul
@@ -43,16 +43,16 @@
title="&newTagDialog.title;"
onload="onLoad();"
ondialogaccept="return onOKNewTag();">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
</stringbundleset>
- <script type="application/x-javascript" src="chrome://messenger/content/newTagDialog.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/newTagDialog.js"/>
<label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
<hbox>
<textbox id="name" oninput="doEnabling();"/>
<colorpicker class="small-margin" type="button" id="tagColorPicker" palettename="standard"/>
</hbox>
<separator/>
</dialog>
--- a/mail/base/content/newmailalert.xul
+++ b/mail/base/content/newmailalert.xul
@@ -41,17 +41,17 @@
<window id="newMailAlertNotification"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
windowtype="alert:alert"
role="alert"
align="start"
onload="onAlertLoad()">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
- <script type="application/x-javascript" src="chrome://messenger/content/newmailalert.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/newmailalert.js"/>
<stack id="alertContainer" mousethrough="always">
<hbox id="alertBox">
<hbox id ="alertImageBox" align="center" valign="center">
<image id="alertImage"/>
</hbox>
<vbox id="alertTextBox">
--- a/mail/base/content/subscribe.xul
+++ b/mail/base/content/subscribe.xul
@@ -50,19 +50,19 @@
onload="SubscribeOnLoad()"
onunload="SubscribeOnUnload()"
ondialogaccept="return subscribeOK();"
ondialogcancel="return subscribeCancel();">
<stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/subscribe.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
+<script type="application/javascript" src="chrome://messenger/content/subscribe.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
<grid flex="1" style="width: 40em; height: 25em;">
<columns>
<column flex="1"/>
<column/>
</columns>
<rows>
--- a/mail/base/content/systemIntegrationDialog.xul
+++ b/mail/base/content/systemIntegrationDialog.xul
@@ -61,17 +61,17 @@
<dialog xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="systemIntegrationDialog"
buttons="accept,cancel"
onload="gSystemIntegrationDialog.onLoad();"
ondialogaccept="return gSystemIntegrationDialog.onAccept();"
title="&systemIntegration.title;">
- <script type="application/x-javascript" src="chrome://messenger/content/systemIntegrationDialog.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/systemIntegrationDialog.js"/>
<label control="defaultClientList">&defaultClient.intro;</label>
<listbox rows="3" seltype="single" id="defaultClientList">
<listitem id="checkMail" type="checkbox" label="&email.label;"/>
<listitem id="checkNews" type="checkbox" label="&newsgroups.label;"/>
<listitem id="checkRSS" type="checkbox" label="&feeds.label;"/>
</listbox>
--- a/mail/base/content/utilityOverlay.xul
+++ b/mail/base/content/utilityOverlay.xul
@@ -8,17 +8,17 @@
%globalRegionDTD;
<!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
%utilityDTD;
]>
<overlay id="utilityOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+ <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
<!-- File Menu -->
<menu id="menu_File" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;"/>
<menu id="menu_New" label="&newMenu.label;" accesskey="&newMenu.accesskey;"/>
<menuitem id="menu_close" label="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" command="cmd_close"/>
<!-- quit -->
<menupopup id="menu_FilePopup">
--- a/mail/components/addrbook/content/abContactsPanel.xul
+++ b/mail/components/addrbook/content/abContactsPanel.xul
@@ -56,22 +56,22 @@
onload="AbPanelLoad();"
onunload="AbPanelUnload();"
selectedaddresses="true">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
</stringbundleset>
- <script type="application/x-javascript" src="chrome://messenger/content/addressbook/addressbook.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/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/abContactsPanel.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
+ <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.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/abContactsPanel.js"/>
<popup id="cardProperties">
<menuitem label="&deleteAddrBookCard.label;" oncommand="AbDelete();"/>
<menuitem label="&addrBookCardProperties.label;" oncommand="AbEditSelectedCard();"/>
<menuseparator/>
<menuitem label="&addtoToFieldMenu.label;" oncommand="addSelectedAddresses('addr_to');"/>
<menuitem label="&addtoCcFieldMenu.label;" oncommand="addSelectedAddresses('addr_cc');"/>
<menuitem label="&addtoBccFieldMenu.label;" oncommand="addSelectedAddresses('addr_bcc');"/>
--- a/mail/components/addrbook/content/abEditListDialog.xul
+++ b/mail/components/addrbook/content/abEditListDialog.xul
@@ -49,19 +49,19 @@
ondragover="DragOverAddressListTree(event);"
ondragdrop="DropOnAddressListTree(event);">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
</stringbundleset>
<!-- move needed functions into a single js file -->
- <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/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"/>
<vbox id="editlist">
<hbox>
<spacer flex="1"/>
<label control="ListName" value="&ListName.label;" accesskey="&ListName.accesskey;" class="CardEditLabel"/>
<hbox class="CardEditWidth">
<textbox id="ListName" flex="1"/>
</hbox>
--- a/mail/components/addrbook/content/abMailListDialog.xul
+++ b/mail/components/addrbook/content/abMailListDialog.xul
@@ -49,19 +49,19 @@
ondragover="DragOverAddressListTree(event);"
ondragdrop="DropOnAddressListTree(event);">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
</stringbundleset>
<!-- move needed functions into a single js file -->
- <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/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"/>
<hbox align="center">
<label control="abPopup" value="&addToAddressBook.label;" accesskey="&addToAddressBook.accesskey;"/>
<menulist id="abPopup">
<menupopup id="abPopup-menupopup" class="addrbooksPopup" writable="true"
supportsmaillists="true"/>
</menulist>
</hbox>
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -66,32 +66,32 @@
onunload="OnUnloadAddressBook()">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
</stringbundleset>
-<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailCore.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://communicator/content/contentAreaClick.js"/>
-<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
+<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailCore.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://communicator/content/contentAreaClick.js"/>
+<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
<!-- move needed functions into a single js file -->
-<script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.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/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
+<script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
<commandset id="addressBook">
<commandset id="CommandUpdate_AddressBook"
commandupdater="true"
events="focus,addrbook-select"
oncommandupdate="CommandUpdate_AddressBook()"/>
<commandset id="selectEditMenuItems"
commandupdater="true"
--- a/mail/components/compose/content/editorOverlay.xul
+++ b/mail/components/compose/content/editorOverlay.xul
@@ -47,18 +47,18 @@
<!ENTITY % utilityOverlayDTD SYSTEM
"chrome://communicator/locale/utilityOverlay.dtd">
%utilityOverlayDTD;
]>
<overlay id="editorOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-<script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
+<script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+<script type="application/javascript" src="chrome://editor/content/ComposerCommands.js"/>
<keyset id="editorKeys">
<key id="boldkb" key="&styleBoldCmd.key;" observes="cmd_bold" modifiers="accel"/>
<key id="italickb" key="&styleItalicCmd.key;" observes="cmd_italic" modifiers="accel"/>
<key id="underlinekb" key="&styleUnderlineCmd.key;" observes="cmd_underline" modifiers="accel"/>
<key id="fixedwidthkb" key="&fontFixedWidth.key;" observes="cmd_tt" modifiers="accel"/>
<key id="increaseindentkb" key="&increaseIndent.key;" observes="cmd_indent" modifiers="accel"/>
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -73,33 +73,33 @@
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
<stringbundle id="brandBundle" src="chrome://branding/locale/brand.properties"/>
</stringbundleset>
-<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
-<script type="application/x-javascript" src="chrome://global/content/inlineSpellCheckUI.js"/>
-<script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
+<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
+<script type="application/javascript" src="chrome://global/content/inlineSpellCheckUI.js"/>
+<script type="application/javascript" src="chrome://editor/content/editor.js"/>
+<script type="application/javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
<!-- drag and drop -->
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
<!-- move needed functions into a single js file -->
-<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
-<script type="application/x-javascript" src="chrome://global/content/charsetOverlay.js"/>
-<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+<script type="application/javascript" src="chrome://global/content/charsetOverlay.js"/>
+<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+<script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
<commandset id="composeCommands">
<commandset id="msgComposeCommandUpdate"
commandupdater="true"
events="focus"
oncommandupdate="CommandUpdate_MsgCompose()"/>
<commandset id="globalEditMenuItems"
commandupdater="true"
--- a/mail/components/migration/content/migration.xul
+++ b/mail/components/migration/content/migration.xul
@@ -44,17 +44,17 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&migrationWizard.title;"
onload="MigrationWizard.init()"
onunload="MigrationWizard.uninit()"
style="width: 40em;"
branded="true"
buttons="accept,cancel">
- <script type="application/x-javascript" src="chrome://messenger/content/migration/migration.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/migration/migration.js"/>
<stringbundle id="bundle" src="chrome://messenger/locale/migration/migration.properties"/>
<wizardpage id="importSource" pageid="importSource" next="selectProfile"
label="&importSource.title;"
onpageadvanced="MigrationWizard.onImportSourcePageAdvanced();">
#ifdef XP_WIN
<label control="importSourceGroup">&importFromWin.label;</label>
--- a/mail/components/preferences/advanced.xul
+++ b/mail/components/preferences/advanced.xul
@@ -55,17 +55,17 @@
#endif
#endif
]>
<overlay id="AdvancedPaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="paneAdvanced" onpaneload="gAdvancedPane.init();">
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/advanced.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/advanced.js"/>
<preferences id="advancedPreferences">
<preference id="mail.preferences.advanced.selectedTabIndex"
name="mail.preferences.advanced.selectedTabIndex" type="int"/>
<!-- General tab -->
<preference id="mailnews.database.global.indexer.enabled"
name="mailnews.database.global.indexer.enabled"
type="bool"/>
--- a/mail/components/preferences/compose.xul
+++ b/mail/components/preferences/compose.xul
@@ -45,17 +45,17 @@
%composeDTD;
%editorOverlayDTD;
]>
<overlay id="ComposePaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="paneCompose" onpaneload="gComposePane.init();">
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/compose.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/compose.js"/>
<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
<stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
<stringbundle id="regionBundle" src="chrome://global/locale/regionNames.properties"/>
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
<preferences id="composePreferences">
<preference id="mail.preferences.compose.selectedTabIndex" name="mail.preferences.compose.selectedTabIndex" type="int"/>
--- a/mail/components/preferences/connection.xul
+++ b/mail/components/preferences/connection.xul
@@ -72,17 +72,17 @@
type="bool"/>
<preference id="network.proxy.backup.ssl" name="network.proxy.backup.ssl" type="string"/>
<preference id="network.proxy.backup.ssl_port" name="network.proxy.backup.ssl_port" type="int"/>
<preference id="network.proxy.backup.socks" name="network.proxy.backup.socks" type="string"/>
<preference id="network.proxy.backup.socks_port" name="network.proxy.backup.socks_port" type="int"/>
</preferences>
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/connection.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/connection.js"/>
<groupbox>
<caption label="&proxyTitle.label;"/>
<radiogroup id="networkProxyType" preference="network.proxy.type"
onsyncfrompreference="return gConnectionsDialog.readProxyType();">
<radio value="0" label="&noProxyTypeRadio.label;" accesskey="&noProxyTypeRadio.accesskey;"/>
<radio value="4" label="&WPADTypeRadio.label;" accesskey="&WPADTypeRadio.accesskey;"/>
--- a/mail/components/preferences/display.xul
+++ b/mail/components/preferences/display.xul
@@ -43,19 +43,19 @@
%brandDTD;
%displayDTD;
]>
<overlay id="DisplayPaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="paneDisplay" onpaneload="gDisplayPane.init();">
- <script type="application/x-javascript"
+ <script type="application/javascript"
src="chrome://mozapps/content/preferences/fontbuilder.js"/>
- <script type="application/x-javascript"
+ <script type="application/javascript"
src="chrome://messenger/content/preferences/display.js"/>
<preferences id="displayPreferences">
<preference id="mail.preferences.display.selectedTabIndex" name="mail.preferences.display.selectedTabIndex" type="int"/>
<preference id="mail.fixed_width_messages" name="mail.fixed_width_messages" type="bool"/>
<preference id="mail.quoted_style" name="mail.quoted_style" type="int"/>
<preference id="mail.quoted_size" name="mail.quoted_size" type="int"/>
<preference id="mail.citation_color" name="mail.citation_color" type="string"/>
--- a/mail/components/preferences/dsn.xul
+++ b/mail/components/preferences/dsn.xul
@@ -45,17 +45,17 @@
%dsnDTD;
]>
<prefwindow id="DSNDialog" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
dlgbuttons="accept,cancel"
title="&dialog.title;">
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/dsn.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/dsn.js"/>
<prefpane id="DSNDialogPane" onpaneload="onInit();">
<preferences id="DSNPreferences">
<preference id="mail.dsn.request_on_success_on"
name="mail.dsn.request_on_success_on"
type="bool"/>
<preference id="mail.dsn.request_on_failure_on"
--- a/mail/components/preferences/fonts.xul
+++ b/mail/components/preferences/fonts.xul
@@ -72,18 +72,18 @@
type="int"/>
<preference id="intl.charset.default" name="intl.charset.default" type="wstring"/>
<preference id="mailnews.send_default_charset" name="mailnews.send_default_charset" type="wstring"/>
<preference id="mailnews.view_default_charset" name="mailnews.view_default_charset" type="wstring"/>
<preference id="mailnews.reply_in_default_charset" name="mailnews.reply_in_default_charset" type="bool"/>
</preferences>
<stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
- <script type="application/x-javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/fonts.js"/>
+ <script type="application/javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/fonts.js"/>
<groupbox>
<caption>
<hbox align="center">
<label value="&language.label;" accesskey="&language.accesskey;"
control="selectLangs"/>
</hbox>
<menulist id="selectLangs" onsyncfrompreference="return gFontsDialog.readFontLanguageGroup();"
--- a/mail/components/preferences/general.xul
+++ b/mail/components/preferences/general.xul
@@ -43,17 +43,17 @@
<!ENTITY % generalDTD SYSTEM "chrome://messenger/locale/preferences/general.dtd" >
%generalDTD;
]>
<overlay id="GeneralPaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="paneGeneral" onpaneload="gGeneralPane.init();">
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/general.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/general.js"/>
<preferences id="generalPreferences">
<preference id="mail.pane_config.dynamic" name="mail.pane_config.dynamic" type="int"/>
<preference id="mailnews.reuse_message_window" name="mailnews.reuse_message_window" type="bool"/>
<preference id="mailnews.start_page.enabled" name="mailnews.start_page.enabled" type="bool"/>
<preference id="mailnews.start_page.url" name="mailnews.start_page.url" type="string"/>
<preference id="mail.biff.show_alert" name="mail.biff.show_alert" type="bool"/>
<preference id="mail.biff.play_sound" name="mail.biff.play_sound" type="bool"/>
--- a/mail/components/preferences/junkLog.xul
+++ b/mail/components/preferences/junkLog.xul
@@ -49,17 +49,17 @@
windowtype="mailnews:junklog"
buttons="accept"
buttonlabelaccept="&closeLog.label;"
buttonaccesskeyaccept="&closeLog.accesskey;"
ondialogaccept="window.close()"
persist="screenX screenY width height"
style="width: 40em; height: 25em;">
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/junkLog.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/junkLog.js"/>
<vbox flex="1">
<hbox>
<label value="&junkLogInfo.label;"/>
<spacer flex="1"/>
<button label="&clearLog.label;" accesskey="&clearLog.accesskey;" oncommand="clearLog()"/>
</hbox>
<vbox flex="1">
--- a/mail/components/preferences/security.xul
+++ b/mail/components/preferences/security.xul
@@ -43,17 +43,17 @@
%brandDTD;
%securityDTD;
]>
<overlay id="SecurityPaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="paneSecurity" onpaneload="gSecurityPane.init();">
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/security.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/security.js"/>
<stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
<preferences id="securityPreferences">
<preference id="mail.preferences.security.selectedTabIndex"
name="mail.preferences.security.selectedTabIndex" type="int"/>
<preference id="mail.spam.manualMark"
name="mail.spam.manualMark"
--- a/mail/components/preferences/sendoptions.xul
+++ b/mail/components/preferences/sendoptions.xul
@@ -51,17 +51,17 @@
<prefwindow id="SendOptionsDialog" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
dlgbuttons="accept,cancel"
style="height: 33em;"
title="&dialog.title;">
<prefpane id="SendOptionsDialogPane" onpaneload="gSendOptionsDialog.init();">
- <script type="application/x-javascript" src="chrome://messenger/content/preferences/sendoptions.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/preferences/sendoptions.js"/>
<stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
<preferences id="SendOptionsPreferences">
<preference id="mail.default_html_action" name="mail.default_html_action" type="int"/>
<preference id="mailnews.html_domains" name="mailnews.html_domains" type="string"/>
<preference id="mailnews.plaintext_domains" name="mailnews.plaintext_domains" type="string"/>
</preferences>
--- a/mail/extensions/mailviews/content/mailViewList.xul
+++ b/mail/extensions/mailviews/content/mailViewList.xul
@@ -58,17 +58,17 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="mailViewListOnLoad();"
windowtype="mailnews:mailviewlist"
title="&mailViewListTitle.label;"
width="400" height="340"
buttons="accept"
persist="screenX screenY width height">
- <script type="application/x-javascript" src="chrome://messenger/content/mailViewList.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/mailViewList.js"/>
<vbox flex="1">
<hbox flex="1">
<listbox id="mailViewList" flex="1" onselect="onMailViewSelect(event);">
<listcols>
<listcol flex="1" width="0"/>
</listcols>
<listhead>
--- a/mail/extensions/mailviews/content/mailViewSetup.xul
+++ b/mail/extensions/mailviews/content/mailViewSetup.xul
@@ -55,18 +55,18 @@
title="&mailViewSetupTitle.label;"
style="width: 52em; height: 22em;"
persist="screenX screenY width height">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
</stringbundleset>
- <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
- <script type="application/x-javascript" src="chrome://messenger/content/mailViewSetup.js"/>
+ <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+ <script type="application/javascript" src="chrome://messenger/content/mailViewSetup.js"/>
<dummy class="usesMailWidgets"/>
<vbox flex="1">
<separator class="thin"/>
<vbox>
<hbox align="center">
<label value="&mailViewHeading.label;" accesskey="&mailViewHeading.accesskey;" control="name"/>
--- a/mail/extensions/smime/content/msgCompSecurityInfo.xul
+++ b/mail/extensions/smime/content/msgCompSecurityInfo.xul
@@ -44,17 +44,17 @@
<dialog id="msgCompSecurityInfo" title="&title.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 50em;"
persist="width height"
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"/>
<description>&subject.plaintextWarning;</description>
<separator class="thin"/>
<description>&status.heading;</description>
<grid>
<columns>
--- a/mail/extensions/smime/content/msgReadSMIMEOverlay.xul
+++ b/mail/extensions/smime/content/msgReadSMIMEOverlay.xul
@@ -37,17 +37,17 @@
# ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <script type="application/x-javascript" src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
+ <script type="application/javascript" src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
</stringbundleset>
<commandset id="mailViewMenuItems">
<command id="cmd_viewSecurityStatus" oncommand="showMessageReadSecurityInfo();" disabled="true"/>