Bug 381468 - Convert toolkit application/x-javascript to application/javascript. r=gavin.sharp
authorsdwilsh@shawnwilsher.com
Wed, 23 May 2007 11:08:10 -0700
changeset 1787 dfbcd592e4c1bf1d2f6c5389330e3ae52d0cce9d
parent 1786 18d192e75ff28dbaacabf3989f7f45f443886cf2
child 1788 b36cba48621fff7bfe2a6ce621d30555039b06bc
push idunknown
push userunknown
push dateunknown
reviewersgavin.sharp
bugs381468
milestone1.9a5pre
Bug 381468 - Convert toolkit application/x-javascript to application/javascript. r=gavin.sharp
toolkit/components/alerts/resources/content/alert.xul
toolkit/components/console/content/console.xul
toolkit/components/cookie/content/cookieAcceptDialog.xul
toolkit/components/filepicker/content/filepicker.xul
toolkit/components/help/content/help.xul
toolkit/components/printing/content/printPageSetup.xul
toolkit/components/printing/content/printPreviewProgress.xul
toolkit/components/printing/content/printProgress.xul
toolkit/components/printing/content/printdialog.xul
toolkit/components/printing/content/printjoboptions.xul
toolkit/components/viewsource/content/viewPartialSource.xul
toolkit/components/viewsource/content/viewSource.xul
toolkit/content/about.xhtml
toolkit/content/charsetOverlay.xul
toolkit/content/commonDialog.xul
toolkit/content/customizeCharset.xul
toolkit/content/customizeToolbar.xul
toolkit/content/editMenuOverlay.xul
toolkit/content/finddialog.xul
toolkit/content/macWindowMenu.inc
toolkit/content/plugins.html
toolkit/content/selectDialog.xul
toolkit/content/widgets/browser.xml
toolkit/content/widgets/editor.xml
toolkit/mozapps/downloads/content/downloadProperties.xul
toolkit/mozapps/downloads/content/unknownContentType.xul
toolkit/mozapps/extensions/content/about.xul
toolkit/mozapps/extensions/content/extensions.xul
toolkit/mozapps/extensions/content/list.xul
toolkit/mozapps/extensions/content/update.xul
toolkit/mozapps/plugins/content/pluginInstallerWizard.xul
toolkit/mozapps/update/content/errors.xul
toolkit/mozapps/update/content/history.xul
toolkit/mozapps/update/content/incompatible.xul
toolkit/mozapps/update/content/updates.xul
toolkit/obsolete/content/dialogOverlay.xul
toolkit/obsolete/content/globalOverlay.xul
toolkit/profile/content/createProfileWizard.xul
toolkit/profile/content/profileSelection.xul
--- a/toolkit/components/alerts/resources/content/alert.xul
+++ b/toolkit/components/alerts/resources/content/alert.xul
@@ -42,28 +42,28 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         windowtype="alert:alert"
         xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
         xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
         xhtml2:role="wairole:alert"
         pack="start"
         onload="onAlertLoad()">
   
-  <script type="application/x-javascript" src="chrome://global/content/alerts/alert.js"/>
+  <script type="application/javascript" src="chrome://global/content/alerts/alert.js"/>
 
   <box id="alertBox" class="alertBox">
     
     <hbox class="alertImageBox" align="center" pack="center">
       <image id="alertImage"/>
     </hbox>
 
     <vbox id="alertTextBox" class="alertTextBox">
       <label id="alertTitleLabel" class="alertTitle plain"/>
       <label id="alertTextLabel" class="alertText plain" onclick="onAlertClick();"/>
     </vbox>
 
   </box>
 
   <!-- This method is called inline because we want to make sure we establish the width
        and height of the alert before we fire the onload handler. -->
-  <script type="application/x-javascript">prefillAlertInfo();</script>
+  <script type="application/javascript">prefillAlertInfo();</script>
 </window>
 
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -51,18 +51,18 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&errorConsole.title;"
         windowtype="global:console"
         width="640" height="480"
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode"
         onclose="return closeWindow(false);"> 
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/console.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/console.js"/>
 
   <stringbundle id="ConsoleBundle" src="chrome://global/locale/console.properties"/>
 
   <commandset id="editMenuCommands"/>
 
   <commandset id="consoleCommands">
     <command id="cmd_close" oncommand="closeWindow(true)"/>
   </commandset>
--- a/toolkit/components/cookie/content/cookieAcceptDialog.xul
+++ b/toolkit/components/cookie/content/cookieAcceptDialog.xul
@@ -52,17 +52,17 @@
     cancelLabel="&button.deny.label;"
     cancelKey="&button.deny.accesskey;"
     onload="onload();"
     ondialogaccept="return doOKButton();"
     title="&dialog.title;"
     buttons="disclosure"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script src="cookieAcceptDialog.js" type="application/x-javascript"/>
+  <script src="cookieAcceptDialog.js" type="application/javascript"/>
   <stringbundle id="cookieBundle"
                 src="chrome://cookie/locale/cookieAcceptDialog.properties"/>
  
   <vbox>
     <hbox>
       <hbox align="start">
         <image id="infoicon" class="spaced alert-icon"/>
       </hbox>
--- a/toolkit/components/filepicker/content/filepicker.xul
+++ b/toolkit/components/filepicker/content/filepicker.xul
@@ -50,17 +50,17 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="filepickerLoad();"
   width="426" height="300"
   ondialogaccept="return selectOnOK();"
   ondialogcancel="return onCancel();"
   persist="screenX screenY width height">
 
 <stringbundle id="bundle_filepicker" src="chrome://global/locale/filepicker.properties"/>
-<script type="application/x-javascript" src="chrome://global/content/filepicker.js"/>
+<script type="application/javascript" src="chrome://global/content/filepicker.js"/>
 
 <hbox align="center">
   <label value="&lookInMenuList.label;" control="lookInMenuList" accesskey="&lookInMenuList.accesskey;"/>
   <menulist id="lookInMenuList" flex="1" oncommand="onDirectoryChanged(event.target);" crop="start">
     <menupopup id="lookInMenu"/>
   </menulist>
   <button id="folderUpButton" class="up-button" tooltiptext="&folderUp.tooltiptext;" oncommand="goUp();"/>
   <button id="homeButton" class="home-button" tooltiptext="&folderHome.tooltiptext;" oncommand="goHome();"/>
--- a/toolkit/components/help/content/help.xul
+++ b/toolkit/components/help/content/help.xul
@@ -64,20 +64,20 @@
 #ifdef HELP_ALWAYS_RAISED_TOGGLE
         persist="width height screenX screenY zlevel"
 #else
         persist="width height screenX screenY"
 #endif
         onload="init();"
         onunload="window.XULBrowserWindow.destroy();">
 
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://help/content/help.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <menupopup id="backMenu" position="after_start"
              onpopupshowing="return createBackMenu(event);"
              oncommand="gotoHistoryIndex(event);"/>
   <menupopup id="forwardMenu" position="after_start"
              onpopupshowing="return createForwardMenu(event);"
              oncommand="gotoHistoryIndex(event);"/>
   <popupset id="contentAreaContextSet"/>
--- a/toolkit/components/printing/content/printPageSetup.xul
+++ b/toolkit/components/printing/content/printPageSetup.xul
@@ -51,17 +51,17 @@
   id="printPageSetupDialog"
   onload="onLoad();"
   ondialogaccept="return onAccept();"
   oncancel="return onCancel();"
   title="&printSetup.title;"
   persist="screenX screenY"
   screenX="24" screenY="24">
 
-  <script type="application/x-javascript" src="chrome://global/content/printPageSetup.js"/>
+  <script type="application/javascript" src="chrome://global/content/printPageSetup.js"/>
 
   <!-- Localizable strings manipulated at run-time. -->
   <data id="marginUnits.inches">&marginUnits.inches;</data>
   <data id="marginUnits.metric">&marginUnits.metric;</data>
   <data id="customPrompt.title">&customPrompt.title;</data>
   <data id="customPrompt.prompt">&customPrompt.prompt;</data>
 
   <tabbox>
--- a/toolkit/components/printing/content/printPreviewProgress.xul
+++ b/toolkit/components/printing/content/printPreviewProgress.xul
@@ -44,17 +44,17 @@
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
         title="&printWindow.title;"
         style="width: 36em;"
         onload="onLoad()"
         onunload="onUnload()">
 
-  <script type="application/x-javascript" src="chrome://global/content/printPreviewProgress.js"/>
+  <script type="application/javascript" src="chrome://global/content/printPreviewProgress.js"/>
 
     <grid flex="1">
       <columns>
         <column/>
         <column/>
       </columns>
       
       <rows>
--- a/toolkit/components/printing/content/printProgress.xul
+++ b/toolkit/components/printing/content/printProgress.xul
@@ -46,17 +46,17 @@
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
         title="&printWindow.title;"
         style="width: 36em;"
         onload="onLoad()"
         onunload="onUnload()">
 
-  <script type="application/x-javascript" src="chrome://global/content/printProgress.js"/>
+  <script type="application/javascript" src="chrome://global/content/printProgress.js"/>
 
     <!-- This is non-visible content that simply adds translatable string
          into the document so that it is accessible to JS code.
          
          XXX-TODO: 
           convert to use string bundles. 
     -->
   
--- a/toolkit/components/printing/content/printdialog.xul
+++ b/toolkit/components/printing/content/printdialog.xul
@@ -49,18 +49,18 @@
   onload="onLoad();"
   ondialogaccept="return onAccept();"
   oncancel="return onCancel();"
   buttoniconaccept="print"
   title="&printDialog.title;"
   persist="screenX screenY"
   screenX="24" screenY="24">
 
-  <script type="application/x-javascript" src="chrome://global/content/printdialog.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://global/content/printdialog.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
 
   <groupbox>
     <caption label="&printer.label;"/>
 
     <grid>
       <columns>
         <column/>
         <column flex="1"/>
--- a/toolkit/components/printing/content/printjoboptions.xul
+++ b/toolkit/components/printing/content/printjoboptions.xul
@@ -46,18 +46,18 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="onLoad();"
   ondialogaccept="return onAccept();"
   title="&printJobOptions.title;"
   persist="screenX screenY"
   screenX="24" screenY="24">
 
-  <script type="application/x-javascript" src="chrome://global/content/printjoboptions.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://global/content/printjoboptions.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
   <grid>
     <columns>
       <column/>
       <column flex="1"/>
     </columns>
 
     <rows>
       <row id="jobTitleGroup">
--- a/toolkit/components/viewsource/content/viewPartialSource.xul
+++ b/toolkit/components/viewsource/content/viewPartialSource.xul
@@ -61,23 +61,23 @@
         titlemodifier="&mainWindow.titlemodifier;" 
         titlepreface=""
         titlemenuseparator ="&mainWindow.titlemodifierseparator;"  
         windowtype="navigator:view-source"
         width="500" height="300"
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/viewSource.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/viewPartialSource.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/viewSource.js"/>
+  <script type="application/javascript" src="chrome://global/content/viewPartialSource.js"/>
+  <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
   <stringbundle id="viewSourceBundle" src="chrome://global/locale/viewSource.properties"/>
 
   <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
   <command id="cmd_print" oncommand="PrintUtils.print();"/>
   <command id="cmd_printpreview" oncommand="PrintUtils.printPreview(onEnterPP, onExitPP);"/>
   <command id="cmd_pagesetup" oncommand="PrintUtils.showPageSetup();"/>
   <command id="cmd_close" oncommand="window.close();"/>
--- a/toolkit/components/viewsource/content/viewSource.xul
+++ b/toolkit/components/viewsource/content/viewSource.xul
@@ -62,22 +62,22 @@
         titlemodifier="&mainWindow.titlemodifier;" 
         titlepreface="&mainWindow.preface;"
         titlemenuseparator ="&mainWindow.titlemodifierseparator;"  
         windowtype="navigator:view-source"
         width="640" height="480"
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/viewSource.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/viewSource.js"/>
+  <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   
   <stringbundle id="viewSourceBundle" src="chrome://global/locale/viewSource.properties"/>
 
   <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
   <command id="cmd_print" oncommand="PrintUtils.print();"/>
   <command id="cmd_printpreview" oncommand="PrintUtils.printPreview(onEnterPP, onExitPP);"/>
   <command id="cmd_pagesetup" oncommand="PrintUtils.showPageSetup();"/>
   <command id="cmd_close" oncommand="window.close();"/>
--- a/toolkit/content/about.xhtml
+++ b/toolkit/content/about.xhtml
@@ -66,17 +66,17 @@
     </a>
   </div>
 
   <ul id="aboutPageList">
     <li>&about.copy.beforeLink; <a href="about:credits">&about.copy.linkTitle;</a> &about.copy.afterLink;</li>
     <li>&about.license.beforeLink; <a href="about:license">&about.license.linkTitle;</a> &about.license.afterLink;</li>
     <li>&about.relnotes.beforeLink; <a id="releaseNotesURL" href="">&about.relnotes.linkTitle;</a> &about.relnotes.afterLink;</li>
     <li>&about.buildconfig.beforeLink; <a href="about:buildconfig">&about.buildconfig.linkTitle;</a> &about.buildconfig.afterLink;</li>
-    <script type="application/x-javascript">
+    <script type="application/javascript">
       // get release notes URL from prefs
       try {
         var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
                                   .getService(Components.interfaces.nsIURLFormatter);
         var releaseNotesURL = formatter.formatURLPref("app.releaseNotesURL");
         var relnotes = document.getElementById("releaseNotesURL");
         relnotes.setAttribute("href", releaseNotesURL);
       }
--- a/toolkit/content/charsetOverlay.xul
+++ b/toolkit/content/charsetOverlay.xul
@@ -1,17 +1,17 @@
 <?xml version="1.0"?> 
 
 <!DOCTYPE  overlay SYSTEM "chrome://global/locale/charsetOverlay.dtd">
 
 <overlay id="charsetOverlay"
     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/charsetOverlay.js"/>
+    <script type="application/javascript" src="chrome://global/content/charsetOverlay.js"/>
 
     <!-- Composer Charset Menu -->
     <menu id="composerCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:ComposerCharsetMenuRoot" oncommand="ComposerMultiplexHandler(event)" onpopupshowing="CreateMenu('composer');UpdateMenus()" onpopupshown="CreateMenu('more-menu');">
         <template>
             <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
                 <menupopup>
                 <menuseparator uri="..." />
                 </menupopup>
--- a/toolkit/content/commonDialog.xul
+++ b/toolkit/content/commonDialog.xul
@@ -11,17 +11,17 @@
         xhtml2:role="wairole:alert"
         onload="commonDialogOnLoad();"
         ondialogaccept="return commonDialogOnAccept();"
         ondialogextra1="return commonDialogOnExtra1();"
         ondialogextra2="return commonDialogOnExtra2();"
         buttonpack="center"
         style="min-width: 29em; min-height: 8.5em; -moz-user-focus: ignore;"> 
     
-  <script type="application/x-javascript" src="chrome://global/content/commonDialog.js"/>
+  <script type="application/javascript" src="chrome://global/content/commonDialog.js"/>
 
   <hbox flex="1">
     <hbox align="start">
       <image id="info.icon" class="spaced"/>
     </hbox>
     
     <vbox flex="1" style="max-width: 45em;">
 #ifdef XP_MACOSX
@@ -59,10 +59,10 @@
     </vbox>
   </hbox>
 
   <!-- This method is called inline because it may unset hidden="true" on the
        above boxes, causing their frames to be build and bindings to load.  
        So, by calling this inline, we guarantee the textboxes and checkboxes 
        above will have their bindings before initButtons is called, and the
        dialog will be intrinsically sized correctly. -->
-  <script type="application/x-javascript">showControls();</script>
+  <script type="application/javascript">showControls();</script>
 </dialog>
--- a/toolkit/content/customizeCharset.xul
+++ b/toolkit/content/customizeCharset.xul
@@ -43,18 +43,18 @@
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/customizeCharset.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&title.label;"
         onload="Init();"
         ondialogaccept="return Save();"
         persist="width height">
 
-  <script type="application/x-javascript" src="chrome://global/content/customizeCharset.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript" src="chrome://global/content/customizeCharset.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");
   ]]>
   </script>
   
   <!-- The two-pane -->
   <hbox flex="1">
--- a/toolkit/content/customizeToolbar.xul
+++ b/toolkit/content/customizeToolbar.xul
@@ -51,18 +51,18 @@
 <window id="CustomizeToolbarWindow"
         title="&dialog.title;"
         onload="onLoad();"
         onunload="finishToolbarCustomization();"
         style="&dialog.style;"
         persist="width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/x-javascript" src="chrome://global/content/customizeToolbar.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://global/content/customizeToolbar.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
 <stringbundle id="stringBundle" src="chrome://global/locale/customizeToolbar.properties"/>
 
 <keyset>
   <key id="cmd_close_sheet" keycode="VK_ESCAPE" oncommand="window.close();"/>
   <key id="cmd_close_sheet" keycode="VK_RETURN" oncommand="window.close();"/>
   <key id="cmd_close_sheet" keycode="VK_ENTER" oncommand="window.close();"/>
 </keyset>
--- a/toolkit/content/editMenuOverlay.xul
+++ b/toolkit/content/editMenuOverlay.xul
@@ -1,17 +1,17 @@
 <?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 <!DOCTYPE overlay SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
 
 <overlay id="editMenuOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://global/content/editMenuOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
 
   <commandset id="editMenuCommands">
     <commandset id="editMenuCommandSetAll" commandupdater="true" events="focus,select"
                 oncommandupdate="goUpdateGlobalEditMenuItems()"/>
     <commandset id="editMenuCommandSetUndo" commandupdater="true" events="undo"
                 oncommandupdate="goUpdateUndoEditMenuItems()"/>
     <commandset id="editMenuCommandSetPaste" commandupdater="true" events="clipboard"
                 oncommandupdate="goUpdatePasteMenuItems()"/>
--- a/toolkit/content/finddialog.xul
+++ b/toolkit/content/finddialog.xul
@@ -53,17 +53,17 @@
   windowtype="findInPage"
   onload="onLoad();"
   onunload="onUnload();"
   ondialogaccept="return onAccept();"
   buttons="accept,cancel"
   title="&findDialog.title;"
   persist="screenX screenY">
 
-  <script type="application/x-javascript" src="chrome://global/content/finddialog.js"/>
+  <script type="application/javascript" src="chrome://global/content/finddialog.js"/>
   <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
 
   <hbox flex="1">
     <vbox flex="1">
       <hbox flex="1">
         <label value="&findField.label;" accesskey="&findField.accesskey;" control="dialog.findKey"/>
         <textbox id="dialog.findKey" flex="1" oninput="doEnabling();"/>
       </hbox>
--- a/toolkit/content/macWindowMenu.inc
+++ b/toolkit/content/macWindowMenu.inc
@@ -1,9 +1,9 @@
-    <script type="application/x-javascript" src="chrome://global/content/macWindowMenu.js"/>
+    <script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
     <commandset id="baseMenuCommandSet">
         <command id="minimizeWindow"
                  label="&minimizeWindow.label;"
                  oncommand="window.minimize();" />
         <command id="zoomWindow"
                  label="&zoomWindow.label;"
                  oncommand="zoomWindow();" />
     </commandset>
--- a/toolkit/content/plugins.html
+++ b/toolkit/content/plugins.html
@@ -38,29 +38,29 @@
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - 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 ***** -->
 
 <html>
 <head>
-<script type="application/x-javascript">
+<script type="application/javascript">
   var strBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService);
   var pluginsbundle = strBundleService.createBundle("chrome://global/locale/plugins.properties");
   var regionbundle = strBundleService.createBundle("chrome://global-region/locale/region.properties");
 
   document.writeln("<title>" + pluginsbundle.GetStringFromName("title_label") + "<\/title>");
 </script>
 <link rel="stylesheet" type="text/css" href="chrome://global/content/plugins.css">
 <link rel="stylesheet" type="text/css" href="chrome://global/skin/plugins.css">
 </head>
 <body>
 <div id="outside">
-<script type="application/x-javascript">
+<script type="application/javascript">
 
   /* JavaScript to enumerate and display all installed plug-ins
 
    * First, refresh plugins in case anything has been changed recently in
    * prefs: (The "false" argument tells refresh not to reload or activate
    * any plug-ins that would be active otherwise.  In contrast, one would
    * use "true" in the case of ASD instead of restarting)
    */
--- a/toolkit/content/selectDialog.xul
+++ b/toolkit/content/selectDialog.xul
@@ -40,17 +40,17 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
  
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
       onload="selectDialogOnLoad()"
       ondialogaccept="return commonDialogOnOK();"
       ondialogcancel="return commonDialogOnCancel();">
 
-  <script type="application/x-javascript" src="chrome://global/content/selectDialog.js" />
+  <script type="application/javascript" src="chrome://global/content/selectDialog.js" />
   <keyset id="dialogKeys"/>
   <vbox style="width: 24em;margin: 5px;">
     <label id="info.txt"/>
     <vbox>
       <listbox id="list" rows="4" flex="1"/>
     </vbox>
   </vbox>
 </dialog>
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -43,17 +43,17 @@
   %findBarDTD;
 ]>
 
 <bindings id="browserBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="browser" extends="xul:browser">
-    <implementation type="application/x-javascript" implements="nsIAccessibleProvider, nsIObserver, nsIDOMEventListener">
+    <implementation type="application/javascript" implements="nsIAccessibleProvider, nsIObserver, nsIDOMEventListener">
       <property name="accessibleType" readonly="true">
         <getter>
           <![CDATA[
             return Components.interfaces.nsIAccessibleProvider.OuterDoc;
           ]]>
         </getter>
       </property>
 
--- a/toolkit/content/widgets/editor.xml
+++ b/toolkit/content/widgets/editor.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 
 <bindings id="editorBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
   
   <binding id="editor">
-    <implementation type="application/x-javascript" implements="nsIAccessibleProvider">
+    <implementation type="application/javascript" implements="nsIAccessibleProvider">
       <constructor>
         <![CDATA[
           // Make window editable immediately only
           //   if the "editortype" attribute is supplied
           // This allows using same contentWindow for different editortypes,
           //   where the type is determined during the apps's window.onload handler.
           if (this.editortype)
             this.makeEditable(this.editortype, true);
--- a/toolkit/mozapps/downloads/content/downloadProperties.xul
+++ b/toolkit/mozapps/downloads/content/downloadProperties.xul
@@ -49,17 +49,17 @@
 <dialog xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&window.title;"
         onload="Startup();"
         style="width: 30em;"
         buttons="accept" acceptbuttontext="&acceptButton.label;">
 
-  <script type="application/x-javascript" src="chrome://mozapps/content/downloads/downloadProperties.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/downloads/downloadProperties.js"/>
 
   <keyset id="downloadInfoKeys">
     <key id="key_close"   key="&cmd.close.commandKey;" oncommand="window.close()"     modifiers="accel"/>
   </keyset>
   
   <grid flex="1">
     <columns>
       <column/>
--- a/toolkit/mozapps/downloads/content/unknownContentType.xul
+++ b/toolkit/mozapps/downloads/content/unknownContentType.xul
@@ -53,17 +53,17 @@
         onload="dialog.initDialog();" onunload="if (dialog) dialog.onCancel();"
         onblur="if (dialog) dialog.onBlur(event);" onfocus="dialog.onFocus(event);"
         style="width: 34em;"
         screenX="" screenY=""
         persist="screenX screenY"
         ondialogaccept="return dialog.onOK()"
         ondialogcancel="return dialog.onCancel()">
 
-  <script type="application/x-javascript" src="chrome://mozapps/content/downloads/helperApps.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/downloads/helperApps.js"/>
 
   <stringbundle id="strings" src="chrome://mozapps/locale/downloads/unknownContentType.properties"/>
 
   <vbox flex="1" id="container">  
     <description>&intro.label;</description>
     <separator class="thin"/>
     <hbox align="start" class="small-indent">
       <image id="contentTypeImage"/>
--- a/toolkit/mozapps/extensions/content/about.xul
+++ b/toolkit/mozapps/extensions/content/about.xul
@@ -42,18 +42,18 @@
 <?xml-stylesheet href="chrome://mozapps/skin/extensions/about.css" type="text/css"?> 
 
 <!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/extensions/about.dtd">
 
 <dialog id="genericAbout"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         buttons="accept" onload="init();" onaccept="close();">
 
-  <script type="application/x-javascript" src="chrome://mozapps/content/extensions/about.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/extensions/about.js"/>
+  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
   
   <stringbundleset id="aboutSet">
     <stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/>
   </stringbundleset>
 
   <vbox id="clientBox" flex="1">
     <label id="extensionName" crop="right"/>
     <label id="extensionVersion" crop="right"/>
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -56,20 +56,20 @@
         xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
         id="extensionsManager" windowtype="Extension:Manager"
         orient="vertical" title="&addons.title;"
         screenX="10" screenY="10" width="&em.width;" height="&em.height;"
         persist="width height screenX screenY sizemode"
         onload="Startup();" onunload="Shutdown();"
         onclose="return closeWindow(false);">
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/x-javascript" src="chrome://mozapps/content/extensions/extensions.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/extensions/extensions.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <stringbundleset id="extensionsSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/>
     <stringbundle id="xpinstallStrings" src="chrome://global/locale/xpinstall/xpinstall.properties"/>
   </stringbundleset>
 
   <keyset id="extensionsKeys">
--- a/toolkit/mozapps/extensions/content/list.xul
+++ b/toolkit/mozapps/extensions/content/list.xul
@@ -40,18 +40,18 @@
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 
 <dialog id="addonList" windowtype="Addons:List"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onunload="shutdown();"
         buttons="accept,cancel" onload="init();">
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" 
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" 
           src="chrome://mozapps/content/extensions/list.js"/>
           
   <stringbundle id="extensionsBundle" 
                 src="chrome://mozapps/locale/extensions/extensions.properties"/>
   <stringbundle id="brandBundle"
                 src="chrome://branding/locale/brand.properties"/>
 
   <hbox align="start">
--- a/toolkit/mozapps/extensions/content/update.xul
+++ b/toolkit/mozapps/extensions/content/update.xul
@@ -53,17 +53,17 @@
         title="&updateWizard.title;"
         windowtype="Update:Wizard"
         branded="true"
         onload="gUpdateWizard.init();"
         onwizardfinish="gUpdateWizard.onWizardFinish();"
         onclose="return gUpdateWizard.onWizardClose(event);"
         buttons="accept,cancel">
 
-  <script type="application/x-javascript" src="chrome://mozapps/content/extensions/update.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/extensions/update.js"/>
   
   <stringbundleset id="updateSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="updateStrings" src="chrome://mozapps/locale/extensions/update.properties"/>
   </stringbundleset>
   
   <wizardpage id="dummy" pageid="dummy"/>
   
--- a/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul
+++ b/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul
@@ -49,19 +49,19 @@
 
 <wizard id="plugin-installer-wizard" title="&pluginWizard.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         persist="width height screenX screenY sizemode"
         style="width: 50em; min-height: 40em;"
         onload="wizardInit()"
         onwizardfinish="return wizardFinish();">
 
-  <script type="application/x-javascript" src="chrome://mozapps/content/plugins/pluginInstallerWizard.js"/>
-  <script type="application/x-javascript" src="chrome://mozapps/content/plugins/pluginInstallerDatasource.js"/>
-  <script type="application/x-javascript" src="chrome://mozapps/content/plugins/pluginInstallerService.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/plugins/pluginInstallerWizard.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/plugins/pluginInstallerDatasource.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/plugins/pluginInstallerService.js"/>
 
   <stringbundleset id="pluginSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="xpinstallStrings" src="chrome://global/locale/xpinstall/xpinstall.properties"/>
     <stringbundle id="pluginWizardString" src="chrome://mozapps/locale/plugins/plugins.properties"/>
   </stringbundleset>
 
   <wizardpage label="&pluginWizard.firstPage.title;">
--- a/toolkit/mozapps/update/content/errors.xul
+++ b/toolkit/mozapps/update/content/errors.xul
@@ -44,17 +44,17 @@
 
 <dialog id="errors"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&errors.title;"
         onload="init()"
         style="width: 40em;"
         buttons="cancel">
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
     function LOG(string) 
     {
       dump("*** " + string + "\n");
       var console = Components.classes["@mozilla.org/consoleservice;1"]
                               .getService(Components.interfaces.nsIConsoleService);  
       console.logStringMessage(string);
     }
--- a/toolkit/mozapps/update/content/history.xul
+++ b/toolkit/mozapps/update/content/history.xul
@@ -52,17 +52,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 35em;"
         buttons="cancel"
         defaultButton="cancel"
         buttonlabelcancel="&closebutton.label;"
         title="&history.title;"
         onload="gUpdateHistory.onLoad();">
 
-  <script type="application/x-javascript" 
+  <script type="application/javascript" 
           src="chrome://mozapps/content/update/history.js"/>
           
   <stringbundle id="updateBundle" 
                 src="chrome://mozapps/locale/update/updates.properties"/>
   
   <label>&history.intro;</label>
   <separator class="thin"/>
   <richlistbox id="historyItems" flex="1">
--- a/toolkit/mozapps/update/content/incompatible.xul
+++ b/toolkit/mozapps/update/content/incompatible.xul
@@ -52,17 +52,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 35em;"
         buttons="cancel"
         defaultButton="cancel"
         buttonlabelcancel="&closebutton.label;"
         title="&incompatible.title;"
         onload="init();">
 
-  <script type="application/x-javascript" 
+  <script type="application/javascript" 
           src="chrome://mozapps/content/update/incompatible.js"/>
           
   <stringbundle id="updateBundle" 
                 src="chrome://mozapps/locale/update/updates.properties"/>
   
   <label>&incompatible.intro;</label>
   <separator/>
   <listbox id="incompatibleItems" rows="5"/>
--- a/toolkit/mozapps/update/content/updates.xul
+++ b/toolkit/mozapps/update/content/updates.xul
@@ -57,17 +57,17 @@
 #else
         windowtype="Update:Wizard" style="width: &window.width;;"
 #endif
         onwizardfinish="gUpdates.onWizardFinish();"
         onwizardcancel="gUpdates.onWizardCancel();"
         onwizardnext="gUpdates.onWizardNext();"        
         onload="gUpdates.onLoad();">
 
-  <script type="application/x-javascript" src="chrome://mozapps/content/update/updates.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/update/updates.js"/>
   
   <stringbundleset id="updateSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="updateStrings" src="chrome://mozapps/locale/update/updates.properties"/>
   </stringbundleset>
   
   <wizardpage id="dummy" pageid="dummy" firstpage="true"/>
 
--- a/toolkit/obsolete/content/dialogOverlay.xul
+++ b/toolkit/obsolete/content/dialogOverlay.xul
@@ -39,17 +39,17 @@
 # WARNING!!! This file is obsoleted by the dialog.xml widget
 #
 
 <!DOCTYPE overlay SYSTEM "chrome://global/locale/dialogOverlay.dtd">
 
 <overlay id="dialogOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/dialogOverlay.js"/>
 
 #ifdef XP_MACOSX
 #
   <hbox id="okCancelButtons">
     <spacer flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
--- a/toolkit/obsolete/content/globalOverlay.xul
+++ b/toolkit/obsolete/content/globalOverlay.xul
@@ -1,14 +1,14 @@
 <?xml version="1.0"?> 
 
 <overlay id="globalOverlay"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <popupset id="aTooltipSet">
     <popup id="aTooltip" class="tooltip" onpopupshowing="return FillInTooltip(document.tooltipNode);" > 
       <label id="TOOLTIP-tooltipText" class="tooltip-label" flex="1"/>
     </popup>
   </popupset>
 
 </overlay>		
--- a/toolkit/profile/content/createProfileWizard.xul
+++ b/toolkit/profile/content/createProfileWizard.xul
@@ -15,18 +15,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onwizardfinish="return onFinish();"
         onload="initWizard();"
         style="&window.size;">
   
   <stringbundle id="bundle_profileManager"
                 src="chrome://mozapps/locale/profile/profileSelection.properties"/>
 
-  <script type="application/x-javascript"
-          src="chrome://mozapps/content/profile/createProfileWizard.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/profile/createProfileWizard.js"/>
 
   <wizardpage id="explanation" onpageshow="enableNextButton();">
     <description>&profileCreationExplanation_1.text;</description>
     <description>&profileCreationExplanation_2.text;</description>
     <description>&profileCreationExplanation_3.text;</description>
     <spacer flex="1"/>
 #ifndef XP_MACOSX
     <description>&profileCreationExplanation_4.text;</description>
--- a/toolkit/profile/content/profileSelection.xul
+++ b/toolkit/profile/content/profileSelection.xul
@@ -63,17 +63,17 @@
   buttonlabelaccept="&start.label;"
   buttonlabelcancel="&exit.label;">
 
   <stringbundle id="bundle_profileManager"
                 src="chrome://mozapps/locale/profile/profileSelection.properties"/>
   <stringbundle id="bundle_brand"
                 src="chrome://branding/locale/brand.properties"/>
 
-  <script type="application/x-javascript" src="chrome://mozapps/content/profile/profileSelection.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/profile/profileSelection.js"/>
 
   <description class="label">&pmDescription.label;</description>
 
   <separator class="thin"/>
 
   <hbox class="profile-box indent" flex="1">
 
     <vbox id="managebuttons">