Bug 1684878 - Remove unnecessary type attributes from suite files. r=IanN

2021-01-06 20:07:06 +01:00 · 2021-01-06 20:07:06 +01:00 · 59d1317193
--- a/suite/base/content/about.xhtml
+++ b/suite/base/content/about.xhtml
@ -18,7 +18,7 @@
 <head>
  <title>About:</title>
  <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
-  <script type="application/javascript" src="chrome://communicator/content/about.js"/>
+  <script src="chrome://communicator/content/about.js"/>
 </head>

 <body dir="&locale.dir;">
--- a/suite/base/content/aboutLife.xhtml
+++ b/suite/base/content/aboutLife.xhtml
@ -11,7 +11,7 @@
 <head>
  <title>Life, the Universe, and Everything</title>

-  <script type="application/javascript">
+  <script>
    function load()
    {
     document.getElementById("magic").textContent = Math.sqrt(1764);
--- a/suite/base/content/aboutPrivateBrowsing.xul
+++ b/suite/base/content/aboutPrivateBrowsing.xul
@ -18,10 +18,12 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        id="warningScreen"
        align="center">
-  <script type="text/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
-  <script type="text/javascript" src="chrome://help/content/contextHelp.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/aboutPrivateBrowsing.js"/>
+
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://communicator/content/tasksOverlay.js"/>
+  <script src="chrome://help/content/contextHelp.js"/>
+  <script src="chrome://communicator/content/aboutPrivateBrowsing.js"/>
+
  <spacer flex="1"/>
  <hbox id="warningBox" align="start">
    <image id="warningBoxIcon"/>
--- a/suite/base/content/askViewZoom.xul
+++ b/suite/base/content/askViewZoom.xul
@ -14,7 +14,7 @@
  ondialogaccept="return onAccept();"
  onload="onLoad();">

-  <script type="application/javascript" src="chrome://communicator/content/askViewZoom.js"/>
+  <script src="chrome://communicator/content/askViewZoom.js"/>

  <hbox>
    <label value="&selectZoom.label;" control="zoomValue"/>
--- a/suite/base/content/blockedSite.xhtml
+++ b/suite/base/content/blockedSite.xhtml
@ -72,6 +72,6 @@
    - a window.onload function. This is because error pages are loaded as
    - LOAD_BACKGROUND, which means that onload handlers will not be executed.
    -->
-    <script type="application/javascript" src="chrome://communicator/content/blockedSite.js"/>
+    <script src="chrome://communicator/content/blockedSite.js"/>
  </body>
 </html>
--- a/suite/base/content/certError.xhtml
+++ b/suite/base/content/certError.xhtml
@ -158,7 +158,7 @@
    - a window.onload function. This is because error pages are loaded as
    - LOAD_BACKGROUND, which means that onload handlers will not be executed.
    -->
-    <script type="application/javascript" src="chrome://communicator/content/certError.js"/>
+    <script src="chrome://communicator/content/certError.js"/>

  </body>
 </html>
--- a/suite/base/content/contentAreaContextOverlay.xul
+++ b/suite/base/content/contentAreaContextOverlay.xul
@ -7,12 +7,12 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <!-- Context menu -->
-  <script type="application/javascript">
+  <script>
    // Global variable that holds the nsContextMenu instance.
    var gContextMenu = null;
  </script>
-  <script type="application/javascript" src="chrome://communicator/content/nsContextMenu.js"/>
-  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://communicator/content/nsContextMenu.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>

  <stringbundleset>
    <stringbundle id="contentAreaCommandsBundle"
--- a/suite/base/content/defaultClientDialog.xul
+++ b/suite/base/content/defaultClientDialog.xul
@ -21,7 +21,7 @@
        ondialogaccept="return onAccept();"
        title="&defaultClient.title;">

-  <script type="application/javascript" src="chrome://communicator/content/defaultClientDialog.js"/>
+  <script src="chrome://communicator/content/defaultClientDialog.js"/>

  <description>&defaultClient.intro;</description>
  <listbox rows="4" id="defaultList">
--- a/suite/base/content/fullscreen-video.xhtml
+++ b/suite/base/content/fullscreen-video.xhtml
@ -9,7 +9,8 @@
 <head>
  <link href="chrome://communicator/skin/fullscreen-video.css"
        rel="stylesheet" type="text/css"/>
-  <script type="application/javascript"><![CDATA[
+  <script>
+  <![CDATA[

 var contentVideo = window.arguments[0];
 var isPaused = window.arguments[1];
--- a/suite/base/content/gopherAddon.xhtml
+++ b/suite/base/content/gopherAddon.xhtml
@ -18,7 +18,8 @@
  <head>
    <title>&loadError.label;</title>
    <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css"/>
-    <script type="application/javascript"><![CDATA[
+    <script>
+    <![CDATA[

       function goToAddOn() {
         document.location = "https://addons.thunderbird.net/addon/7685";
--- a/suite/base/content/helpEditorOverlay.xul
+++ b/suite/base/content/helpEditorOverlay.xul
@ -6,8 +6,8 @@
 <overlay id="helpEditorOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript" src="chrome://help/content/contextHelp.js"/>
-  <script type="application/javascript">
+  <script src="chrome://help/content/contextHelp.js"/>
+  <script>
  <![CDATA[
    setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');

--- a/suite/base/content/helpMessengerOverlay.xul
+++ b/suite/base/content/helpMessengerOverlay.xul
@ -6,9 +6,8 @@
 <overlay id="helpMessengerOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://help/content/contextHelp.js"/>
-  <script type="application/javascript">
+  <script src="chrome://help/content/contextHelp.js"/>
+  <script>
    setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');
  </script>

--- a/suite/base/content/helpSecurityOverlay.xul
+++ b/suite/base/content/helpSecurityOverlay.xul
@ -6,8 +6,8 @@
 <overlay id="securityManagerOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript" src="chrome://help/content/contextHelp.js"/>
-  <script type="application/javascript">
+  <script src="chrome://help/content/contextHelp.js"/>
+  <script>
  <![CDATA[
    setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');

--- a/suite/base/content/openLocation.xul
+++ b/suite/base/content/openLocation.xul
@ -23,10 +23,10 @@
        persist="screenX screenY"
        screenX="24" screenY="24">

-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/openLocation.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://communicator/content/openLocation.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://navigator/content/sessionHistoryUI.js"/>

  <stringbundle id="openLocationBundle" src="chrome://communicator/locale/openLocation.properties"/>

--- a/suite/base/content/safeMode.xul
+++ b/suite/base/content/safeMode.xul
@ -29,7 +29,7 @@
            onload="onLoad();"
            buttondisabledaccept="true">

-  <script type="application/javascript" src="chrome://communicator/content/safeMode.js"/>
+  <script src="chrome://communicator/content/safeMode.js"/>

  <description>&safeModeDescription.label;</description>

--- a/suite/base/content/sanitize.xul
+++ b/suite/base/content/sanitize.xul
@ -21,8 +21,7 @@
        ondialogcancel="gSanitizePromptDialog.clearSettings();"
        buttonlabelaccept="&sanitizeButton.label;">

-  <script type="application/javascript"
-          src="chrome://communicator/content/sanitizeDialog.js"/>
+  <script src="chrome://communicator/content/sanitizeDialog.js"/>

  <description>&sanitizeItems.label;</description>

--- a/suite/base/content/tasksOverlay.xul
+++ b/suite/base/content/tasksOverlay.xul
@ -13,9 +13,7 @@
 <overlay id="tasksOverlay"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-<script type="application/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
-
-
+<script src="chrome://communicator/content/tasksOverlay.js"/>

 <keyset id="tasksKeys">
 #ifdef XP_MACOSX
--- a/suite/base/content/utilityOverlay.xul
+++ b/suite/base/content/utilityOverlay.xul
@ -17,14 +17,10 @@
 <overlay id="utilityOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/sync/syncUI.js"/>
-  <script type="application/javascript"
-          src="chrome://help/content/contextHelp.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://communicator/content/sync/syncUI.js"/>
+  <script src="chrome://help/content/contextHelp.js"/>

  <stringbundleset>
    <stringbundle id="bundle_utilityOverlay"
--- a/suite/base/content/viewApplyThemeOverlay.xul
+++ b/suite/base/content/viewApplyThemeOverlay.xul
@ -10,8 +10,7 @@
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://communicator/content/viewApplyThemeOverlay.js"/>
+  <script src="chrome://communicator/content/viewApplyThemeOverlay.js"/>

  <stringbundle id="bundle_viewApplyTheme"
                src="chrome://communicator/locale/viewApplyThemeOverlay.properties"/>
--- a/suite/base/content/viewSourceOverlay.xul
+++ b/suite/base/content/viewSourceOverlay.xul
@ -20,10 +20,8 @@
 <overlay id="viewSourceOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://communicator/content/viewSourceOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/findUtils.js"/>
+  <script src="chrome://communicator/content/viewSourceOverlay.js"/>
+  <script src="chrome://communicator/content/findUtils.js"/>

  <window id="viewSource">
    <commandset id="tasksCommands"/>
--- a/suite/base/content/viewZoomOverlay.xul
+++ b/suite/base/content/viewZoomOverlay.xul
@ -10,8 +10,8 @@
         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/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/viewZoomOverlay.js"/>
+  <script src="chrome://global/content/viewZoomOverlay.js"/>
+  <script src="chrome://communicator/content/viewZoomOverlay.js"/>

  <stringbundle id="bundle_viewZoom" src="chrome://communicator/locale/viewZoomOverlay.properties"/>

--- a/suite/branding/seamonkey/content/aboutRights.xhtml
+++ b/suite/branding/seamonkey/content/aboutRights.xhtml
@ -86,7 +86,8 @@
  </ol>
 </div>

-<script type="application/javascript"><![CDATA[
+<script>
+<![CDATA[
  var servicesDiv = document.getElementById("webservices-container");
  servicesDiv.style.display = "none";

--- a/suite/browser/linkToolbarOverlay.xul
+++ b/suite/browser/linkToolbarOverlay.xul
@ -11,14 +11,14 @@
         xmlns:rdf="http://www.mozilla.org/rdf">

  <!-- classes -->
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/linkToolbarHandler.js" />
-  <script type="application/javascript" src="chrome://navigator/content/linkToolbarItem.js" />
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://navigator/content/linkToolbarHandler.js" />
+  <script src="chrome://navigator/content/linkToolbarItem.js" />

  <!-- functions -->
-  <script type="application/javascript" src="chrome://navigator/content/linkToolbarOverlay.js" />
+  <script src="chrome://navigator/content/linkToolbarOverlay.js" />

-  <script type="application/javascript">
+  <script>
    <![CDATA[
      document.addEventListener("pageshow", linkToolbarUI.initHandlers, true);
    ]]>
--- a/suite/browser/mailNavigatorOverlay.xul
+++ b/suite/browser/mailNavigatorOverlay.xul
@ -8,8 +8,7 @@
 <overlay id="mailNavigatorOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://navigator/content/mailNavigatorOverlay.js"/>
+  <script src="chrome://navigator/content/mailNavigatorOverlay.js"/>

  <!-- navigator specific commands -->
  <commandset id="tasksCommands">
--- a/suite/browser/metadata.xul
+++ b/suite/browser/metadata.xul
@ -21,7 +21,7 @@
        persist="screenX screenY"
        screenX="24" screenY="24">

-  <script type="application/javascript" src="chrome://navigator/content/metadata.js"/>
+  <script src="chrome://navigator/content/metadata.js"/>

  <stringbundle src="chrome://navigator/locale/metadata.properties" id="bundle_metadata"/>
  <stringbundle src="chrome://global/locale/languageNames.properties" id="bundle_languages"/>
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@ -42,23 +42,22 @@
        persist="screenX screenY width height sizemode">

  <!-- Generic Utility -->
-  <script type="application/javascript" src="chrome://global/content/viewSourceUtils.js"/>
+  <script src="chrome://global/content/viewSourceUtils.js"/>

  <!-- Content Area -->
-  <script type="application/javascript" src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/nsBrowserContentListener.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/findUtils.js"/>
-  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
+  <script src="chrome://navigator/content/nsBrowserContentListener.js"/>
+  <script src="chrome://communicator/content/contentAreaClick.js"/>
+  <script src="chrome://communicator/content/findUtils.js"/>
+  <script src="chrome://global/content/printUtils.js"/>

  <!-- Navigator -->
-  <script type="application/javascript" src="chrome://navigator/content/fullScreen.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/navigatorDD.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
+  <script src="chrome://navigator/content/fullScreen.js"/>
+  <script src="chrome://navigator/content/navigatorDD.js"/>
+  <script src="chrome://navigator/content/sessionHistoryUI.js"/>

  <!-- Places Bookmarks Utilities -->
-  <script type="application/javascript"
-          src="chrome://navigator/content/browser-places.js"/>
+  <script src="chrome://navigator/content/browser-places.js"/>

  <!-- hook for stringbundle overlays -->
  <stringbundleset id="stringbundleset">
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@ -25,12 +25,10 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <!-- Navigator -->
-  <script type="application/javascript"
-          src="chrome://navigator/content/navigator.js"/>
+  <script src="chrome://navigator/content/navigator.js"/>

  <!-- Places Bookmarks Utilities -->
-  <script type="application/javascript"
-          src="chrome://navigator/content/browser-places.js"/>
+  <script src="chrome://navigator/content/browser-places.js"/>

  <stringbundleset id="stringbundleset">
    <stringbundle id="bundle_navigator"
--- a/suite/browser/pageinfo/pageInfo.xul
+++ b/suite/browser/pageinfo/pageInfo.xul
@ -20,16 +20,16 @@
  align="stretch" style="&pageInfoWindow.dimensions;"
  persist="screenX screenY width height sizemode">

-  <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://global/content/treeUtils.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/pageinfo/pageInfo.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/pageinfo/feeds.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/pageinfo/permissions.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/pageinfo/security.js"/>
-  <script type="application/javascript" src="chrome://help/content/contextHelp.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://global/content/treeUtils.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://navigator/content/pageinfo/pageInfo.js"/>
+  <script src="chrome://navigator/content/pageinfo/feeds.js"/>
+  <script src="chrome://navigator/content/pageinfo/permissions.js"/>
+  <script src="chrome://navigator/content/pageinfo/security.js"/>
+  <script src="chrome://help/content/contextHelp.js"/>
+  <script src="chrome://communicator/content/tasksOverlay.js"/>

  <stringbundleset id="pageinfobundleset">
    <stringbundle id="pageinfobundle" src="chrome://navigator/locale/pageInfo.properties"/>
--- a/suite/browser/safeBrowsingOverlay.xul
+++ b/suite/browser/safeBrowsingOverlay.xul
@ -8,8 +8,7 @@
 <overlay id="safeBrowsingOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://navigator/content/safeBrowsingOverlay.js"/>
+  <script src="chrome://navigator/content/safeBrowsingOverlay.js"/>

  <broadcasterset id="navBroadcasters">
    <broadcaster id="safeBrowsingBroadcaster" disabled="true"/>
--- a/suite/browser/test/browser/browser_privatebrowsing_protocolhandler_page.html
+++ b/suite/browser/test/browser/browser_privatebrowsing_protocolhandler_page.html
@ -4,7 +4,7 @@
    <title>Protocol registrar page</title>
  </head>
  <body>
-    <script type="text/javascript">
+    <script>
      navigator.registerProtocolHandler("testprotocol",
          "https://example.com/foobar?uri=%s",
          "Test Protocol");
--- a/suite/browser/test/browser/pluginCrashCommentAndURL.html
+++ b/suite/browser/test/browser/pluginCrashCommentAndURL.html
@ -2,7 +2,7 @@
 <html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <script type="text/javascript">
+    <script>
      function crash() {
        var plugin = document.getElementById("plugin");
        var argStr = decodeURIComponent(window.location.search.substr(1));
--- a/suite/browser/test/chrome/test_maxSniffing.html
+++ b/suite/browser/test/chrome/test_maxSniffing.html
@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=739040
 -->
 <head>
  <title>Test that we only sniff 512 bytes</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
 </head>
 <body>
@ -18,7 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=739040

 </div>
 <pre id="test">
-<script class="testbody" type="text/javascript">
+<script class="testbody">

 /** Test for Bug 739040 **/
 SimpleTest.waitForExplicitFinish();
--- a/suite/browser/test/mochitest/feed_discovery.html
+++ b/suite/browser/test/mochitest/feed_discovery.html
@ -67,7 +67,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=377611
    <link rel="alternate stylesheet" type="application/rss+xml" title="Bogus13 RSS" href="/Bogus13" />
  </head>
  <body>
-    <script type="text/javascript">
+    <script>
      window.onload = function() {
        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");

--- a/suite/browser/test/mochitest/test_bug364677.html
+++ b/suite/browser/test/mochitest/test_bug364677.html
@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=364677
 -->
 <head>
  <title>Test for Bug 364677</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=364677

 </div>
 <pre id="test">
-<script class="testbody" type="text/javascript">
+<script class="testbody">

 /** Test for Bug 364677 **/
 SimpleTest.waitForExplicitFinish();
--- a/suite/browser/test/mochitest/test_bug395533.html
+++ b/suite/browser/test/mochitest/test_bug395533.html
@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=395533
 -->
 <head>
  <title>Test for Bug 395533</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=395533
  
 </div>
 <pre id="test">
-<script class="testbody" type="text/javascript">
+<script class="testbody">

 /** Test for Bug 395533 **/
 SimpleTest.waitForExplicitFinish();
--- a/suite/browser/test/mochitest/test_bug436801.html
+++ b/suite/browser/test/mochitest/test_bug436801.html
@ -5,8 +5,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=436801
 -->
 <head>
  <title>Test feed preview subscribe UI</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/MochiKit/packed.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=436801
 <div id="content" style="display: none">
 </div>
 <pre id="test">
-<script class="testbody" type="text/javascript">
+<script class="testbody">

 SimpleTest.waitForExplicitFinish();

--- a/suite/browser/test/mochitest/test_contextmenu.html
+++ b/suite/browser/test/mochitest/test_contextmenu.html
@ -2,8 +2,8 @@
 <html>
 <head>
  <title>Tests for browser context menu</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/EventUtils.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@ -14,7 +14,7 @@ Browser context menu tests.
 </div>

 <pre id="test">
-<script class="testbody" type="text/javascript">
+<script class="testbody">

 /** Test for Login Manager: multiple login autocomplete. **/

--- a/suite/browser/test/mochitest/test_feed_discovery.html
+++ b/suite/browser/test/mochitest/test_feed_discovery.html
@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=240393
 -->
 <head>
  <title>Test for feed discovery</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=240393
  
 </div>
 <pre id="test">
-<script class="testbody" type="text/javascript">
+<script class="testbody">

 /** Tests for bug 240393 (from bug 377611 on Firefox side) **/

--- a/suite/browser/test/mochitest/test_registerHandler.html
+++ b/suite/browser/test/mochitest/test_registerHandler.html
@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=402788
 -->
 <head>
  <title>Test for Bug 402788</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=402788
  
 </div>
 <pre id="test">
-<script class="testbody" type="text/javascript">
+<script class="testbody">

 /** Test for Bug 402788 **/

--- a/suite/browser/webDeveloperOverlay.xul
+++ b/suite/browser/webDeveloperOverlay.xul
@ -11,8 +11,7 @@
 <overlay id="webDeveloperOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://navigator/content/webDeveloperOverlay.js"/>
+  <script src="chrome://navigator/content/webDeveloperOverlay.js"/>

  <menupopup id="toolsPopup">
    <menuitem id="validatePage"
--- a/suite/components/console/content/console.xul
+++ b/suite/components/console/content/console.xul
@ -24,9 +24,9 @@
        persist="screenX screenY width height sizemode"
        onclose="return closeWindow(false);">

-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/console/console.js"/>
-  <script type="application/javascript" src="chrome://global/content/viewSourceUtils.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://communicator/content/console/console.js"/>
+  <script src="chrome://global/content/viewSourceUtils.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>

  <stringbundle id="ConsoleBundle" src="chrome://communicator/locale/console/console.properties"/>
--- a/suite/components/dataman/content/dataman.xul
+++ b/suite/components/dataman/content/dataman.xul
@ -27,8 +27,7 @@
  <xhtml:link rel="shortcut icon"
              href="chrome://communicator/skin/dataman/datamanIcon-16.png"/>

-  <script type="application/javascript"
-          src="chrome://communicator/content/dataman/dataman.js"/>
+  <script src="chrome://communicator/content/dataman/dataman.js"/>

  <stringbundleset id="datamanBundleSet">
    <stringbundle id="datamanBundle"
--- a/suite/components/downloads/content/downloadmanager.xul
+++ b/suite/components/downloads/content/downloadmanager.xul
@ -28,14 +28,10 @@
        drawtitle="true"
        windowtype="Download:Manager">

-  <script type="application/javascript"
-          src="chrome://communicator/content/downloads/downloadmanager.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/downloads/DownloadProgressListener.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/downloads/treeView.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://communicator/content/downloads/downloadmanager.js"/>
+  <script src="chrome://communicator/content/downloads/DownloadProgressListener.js"/>
+  <script src="chrome://communicator/content/downloads/treeView.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>

  <stringbundleset id="stringbundleset">
--- a/suite/components/downloads/content/progressDialog.xul
+++ b/suite/components/downloads/content/progressDialog.xul
@ -18,10 +18,8 @@
        persist="screenX screenY"
        style="width:40em;">

-  <script type="application/javascript"
-          src="chrome://communicator/content/downloads/downloadmanager.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/downloads/progressDialog.js"/>
+  <script src="chrome://communicator/content/downloads/downloadmanager.js"/>
+  <script src="chrome://communicator/content/downloads/progressDialog.js"/>

  <stringbundleset id="stringbundleset">
    <stringbundle id="dmBundle"
--- a/suite/components/downloads/content/uploadProgress.xul
+++ b/suite/components/downloads/content/uploadProgress.xul
@ -14,8 +14,7 @@
        onunload="onUnload();"
        style="width: 40em;">

-  <script type="application/javascript"
-          src="chrome://communicator/content/downloads/uploadProgress.js"/>
+  <script src="chrome://communicator/content/downloads/uploadProgress.js"/>

  <stringbundleset id="stringbundleset">
    <stringbundle id="dmBundle"
--- a/suite/components/downloads/tests/chrome/test_action_keys_respect_focus.xul
+++ b/suite/components/downloads/tests/chrome/test_action_keys_respect_focus.xul
@ -48,14 +48,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 var openInvokeCount = 0;
--- a/suite/components/downloads/tests/chrome/test_basic_functionality.xul
+++ b/suite/components/downloads/tests/chrome/test_basic_functionality.xul
@ -48,12 +48,10 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

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

 var dmFile = Services.dirsvc.get("TmpD", Ci.nsIFile);
--- a/suite/components/downloads/tests/chrome/test_cleanup_search.xul
+++ b/suite/components/downloads/tests/chrome/test_cleanup_search.xul
@ -49,12 +49,10 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

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

 function test()
--- a/suite/components/downloads/tests/chrome/test_clear_button_disabled.xul
+++ b/suite/components/downloads/tests/chrome/test_clear_button_disabled.xul
@ -51,13 +51,10 @@
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-
-  <script type="application/javascript">
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

+  <script>
  <![CDATA[

 const nsIDownloadManager = Ci.nsIDownloadManager;
--- a/suite/components/downloads/tests/chrome/test_close_download_manager.xul
+++ b/suite/components/downloads/tests/chrome/test_close_download_manager.xul
@ -48,15 +48,11 @@
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
-
-  <script type="application/javascript">
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

+  <script>
  <![CDATA[

 const dmui = Cc["@mozilla.org/download-manager-ui;1"]
--- a/suite/components/downloads/tests/chrome/test_delete_key_cancels.xul
+++ b/suite/components/downloads/tests/chrome/test_delete_key_cancels.xul
@ -47,14 +47,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 var invokeCount = 0;
--- a/suite/components/downloads/tests/chrome/test_delete_key_removes.xul
+++ b/suite/components/downloads/tests/chrome/test_delete_key_removes.xul
@ -47,14 +47,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 var dmFile = Services.dirsvc.get("TmpD", Ci.nsIFile);
--- a/suite/components/downloads/tests/chrome/test_drag.xul
+++ b/suite/components/downloads/tests/chrome/test_drag.xul
@ -59,13 +59,12 @@ close window
 <window title="Download Manager Test"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js"></script>
-  <script type="application/javascript">
+
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+  <script src="chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js"></script>
+
+  <script>
  <![CDATA[
 var missingFileElid;
 var realFileElid;
--- a/suite/components/downloads/tests/chrome/test_enter_dblclick_opens.xul
+++ b/suite/components/downloads/tests/chrome/test_enter_dblclick_opens.xul
@ -47,14 +47,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 // similar, but not equal to the one in tree_shared.js
--- a/suite/components/downloads/tests/chrome/test_multi_select.xul
+++ b/suite/components/downloads/tests/chrome/test_multi_select.xul
@ -12,14 +12,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 function test()
--- a/suite/components/downloads/tests/chrome/test_multiword_search.xul
+++ b/suite/components/downloads/tests/chrome/test_multiword_search.xul
@ -47,12 +47,10 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

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

 function test()
--- a/suite/components/downloads/tests/chrome/test_open_properties.xul
+++ b/suite/components/downloads/tests/chrome/test_open_properties.xul
@ -49,13 +49,10 @@
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-
-  <script type="application/javascript">
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

+  <script>
  <![CDATA[

 const nsIDownloadManager = Ci.nsIDownloadManager;
--- a/suite/components/downloads/tests/chrome/test_removeDownload_updates_ui.xul
+++ b/suite/components/downloads/tests/chrome/test_removeDownload_updates_ui.xul
@ -46,12 +46,10 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

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

 var dmFile = Services.dirsvc.get("TmpD", Ci.nsIFile);
--- a/suite/components/downloads/tests/chrome/test_search_clearlist.xul
+++ b/suite/components/downloads/tests/chrome/test_search_clearlist.xul
@ -46,12 +46,10 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

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

 function test()
--- a/suite/components/downloads/tests/chrome/test_search_keys.xul
+++ b/suite/components/downloads/tests/chrome/test_search_keys.xul
@ -48,14 +48,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 function test_meta_f(aWin)
--- a/suite/components/downloads/tests/chrome/test_select_all.xul
+++ b/suite/components/downloads/tests/chrome/test_select_all.xul
@ -46,14 +46,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 function test()
--- a/suite/components/downloads/tests/chrome/test_space_key_pauses_resumes.xul
+++ b/suite/components/downloads/tests/chrome/test_space_key_pauses_resumes.xul
@ -47,14 +47,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 function bug413985obs(aWin)
--- a/suite/components/downloads/tests/chrome/test_space_key_retries.xul
+++ b/suite/components/downloads/tests/chrome/test_space_key_retries.xul
@ -47,14 +47,11 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

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

 function dlObs(aWin)
--- a/suite/components/downloads/tests/chrome/test_ui_stays_open_on_alert_clickback.xul
+++ b/suite/components/downloads/tests/chrome/test_ui_stays_open_on_alert_clickback.xul
@ -47,12 +47,10 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="test();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js"/>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

-  <script type="application/javascript">
+  <script>
  <![CDATA[
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");

--- a/suite/components/helpviewer/content/help.xul
+++ b/suite/components/helpviewer/content/help.xul
@ -26,10 +26,10 @@
        onload="init();"
        onunload="window.XULBrowserWindow.destroy();">

-  <script type="application/javascript" src="chrome://help/content/help.js"/>
-  <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/findUtils.js"/>
+  <script src="chrome://help/content/help.js"/>
+  <script src="chrome://global/content/viewZoomOverlay.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://communicator/content/findUtils.js"/>

  <menupopup id="backMenu" position="after_start"
             onpopupshowing="return createBackMenu(event);"
--- a/suite/components/migration/content/migration.xul
+++ b/suite/components/migration/content/migration.xul
@ -17,8 +17,7 @@
        buttons="accept,cancel"
        xmlns:xhtml="http://www.w3.org/1999/xhtml">

-  <script type="application/javascript"
-          src="chrome://communicator/content/migration/migration.js"/>
+  <script src="chrome://communicator/content/migration/migration.js"/>

  <stringbundle id="bundle"
                src="chrome://communicator/locale/migration/migration.properties"/>
--- a/suite/components/permissions/content/cookieViewer.xul
+++ b/suite/components/permissions/content/cookieViewer.xul
@ -20,14 +20,10 @@
        ondialoghelp="doHelpButton();"
        persist="screenX screenY width height">

-  <script type="application/javascript"
-          src="chrome://communicator/content/permissions/cookieViewer.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/permissions/permissionsUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/treeUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://help/content/contextHelp.js" />
+  <script src="chrome://communicator/content/permissions/cookieViewer.js"/>
+  <script src="chrome://communicator/content/permissions/permissionsUtils.js"/>
+  <script src="chrome://global/content/treeUtils.js"/>
+  <script src="chrome://help/content/contextHelp.js" />

  <keyset id="dialogKeys">
    <key key="&focusSearch.key;"
--- a/suite/components/permissions/content/permissionsManager.xul
+++ b/suite/components/permissions/content/permissionsManager.xul
@ -20,12 +20,10 @@
        ondialogcancel="return onCancel();"
        ondialoghelp="return doHelpButton();">

-  <script type="application/javascript" src="chrome://communicator/content/permissions/permissionsManager.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/permissions/permissionsUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/treeUtils.js"/>
-  <script type="application/javascript" src="chrome://help/content/contextHelp.js"/>
+  <script src="chrome://communicator/content/permissions/permissionsManager.js"/>
+  <script src="chrome://communicator/content/permissions/permissionsUtils.js"/>
+  <script src="chrome://global/content/treeUtils.js"/>
+  <script src="chrome://help/content/contextHelp.js"/>

  <stringbundle id="permissionsBundle"
                src="chrome://communicator/locale/permissions/permissionsManager.properties"/>
--- a/suite/components/places/content/bookmarkProperties.xul
+++ b/suite/components/places/content/bookmarkProperties.xul
@ -33,10 +33,8 @@
                  src="chrome://communicator/locale/places/bookmarkProperties.properties"/>
  </stringbundleset>

-  <script type="application/javascript"
-          src="chrome://communicator/content/places/editBookmarkOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/places/bookmarkProperties.js"/>
+  <script src="chrome://communicator/content/places/editBookmarkOverlay.js"/>
+  <script src="chrome://communicator/content/places/bookmarkProperties.js"/>

 <vbox id="editBookmarkPanelContent"/>

--- a/suite/components/places/content/bookmarksPanel.xul
+++ b/suite/components/places/content/bookmarksPanel.xul
@ -19,12 +19,9 @@
      onload="init();"
      onunload="SidebarUtils.setMouseoverURL('');">

-  <script type="application/javascript"
-          src="chrome://communicator/content/bookmarks/sidebarUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/bookmarks/bookmarksPanel.js"/>
+  <script src="chrome://communicator/content/bookmarks/sidebarUtils.js"/>
+  <script src="chrome://communicator/content/bookmarks/bookmarksPanel.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>
-  

  <commandset id="placesCommands"/>
  <menupopup id="placesContext"/>
--- a/suite/components/places/content/history-panel.xul
+++ b/suite/components/places/content/history-panel.xul
@ -26,10 +26,8 @@
      onload="HistorySidebarInit();"
      onunload="SidebarUtils.setMouseoverURL('');">

-  <script type="application/javascript"
-          src="chrome://communicator/content/bookmarks/sidebarUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/places/history-panel.js"/>
+  <script src="chrome://communicator/content/bookmarks/sidebarUtils.js"/>
+  <script src="chrome://communicator/content/places/history-panel.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>

  <commandset id="placesCommands"/>
--- a/suite/components/places/content/places.xul
+++ b/suite/components/places/content/places.xul
@ -38,10 +38,8 @@
        toggletoolbar="true"
        persist="width height screenX screenY sizemode">

-  <script type="application/javascript"
-          src="chrome://communicator/content/places/places.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/places/editBookmarkOverlay.js"/>
+  <script src="chrome://communicator/content/places/places.js"/>
+  <script src="chrome://communicator/content/places/editBookmarkOverlay.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>

  <stringbundleset id="placesStringSet">
--- a/suite/components/places/content/placesOverlay.xul
+++ b/suite/components/places/content/placesOverlay.xul
@ -13,9 +13,9 @@
         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/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"><![CDATA[
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script>
+  <![CDATA[
    const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
    ChromeUtils.defineModuleGetter(window,
      "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
--- a/suite/components/places/tests/chrome/test_0_bug510634.xul
+++ b/suite/components/places/tests/chrome/test_0_bug510634.xul
@ -16,10 +16,8 @@
        title="510634: Wrong icons on bookmarks sidebar"
        onload="runTest();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />

  <body xmlns="http://www.w3.org/1999/xhtml" />

@ -32,7 +30,7 @@
    <treechildren flex="1"/>
  </tree>

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

    /**
--- a/suite/components/places/tests/chrome/test_0_multiple_left_pane.xul
+++ b/suite/components/places/tests/chrome/test_0_multiple_left_pane.xul
@ -21,10 +21,8 @@
        title="Test handling of multiple left pane folders"
        onload="runTest();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />

  <body xmlns="http://www.w3.org/1999/xhtml">
    <p id="display"></p>
@ -32,7 +30,7 @@
    <pre id="test"></pre>
  </body>

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

    function runTest() {
--- a/suite/components/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul
+++ b/suite/components/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul
@ -24,18 +24,15 @@
        title="Bug 427633 - Disable creating a New Folder in the bookmarks dialogs if insertionPoint is invalid"
        onload="runTest();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript"
-          src="chrome://communicator/content/places/editBookmarkOverlay.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script src="chrome://communicator/content/places/editBookmarkOverlay.js"/>

  <body xmlns="http://www.w3.org/1999/xhtml" />

  <vbox id="editBookmarkPanelContent"/>

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

     /**
--- a/suite/components/places/tests/chrome/test_bug485100-change-case-loses-tag.xul
+++ b/suite/components/places/tests/chrome/test_bug485100-change-case-loses-tag.xul
@ -24,18 +24,15 @@
        title="485100: Exchanging a letter of a tag name with its big/small equivalent removes tag from bookmark"
        onload="runTest();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript"
-          src="chrome://communicator/content/places/editBookmarkOverlay.js"/>
+  <script src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script src="chrome://communicator/content/places/editBookmarkOverlay.js"/>

  <body xmlns="http://www.w3.org/1999/xhtml" />

  <vbox id="editBookmarkPanelContent"/>

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

    function runTest() {
--- a/suite/components/places/tests/chrome/test_bug549192.xul
+++ b/suite/components/places/tests/chrome/test_bug549192.xul
@ -17,11 +17,9 @@
        title="549192:  History view not updated after deleting entry"
        onload="runTest();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="head.js" />
+  <script src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script src="head.js" />

  <body xmlns="http://www.w3.org/1999/xhtml" />

@ -35,7 +33,8 @@
    <treechildren flex="1"/>
  </tree>

-  <script type="application/javascript"><![CDATA[
+  <script>
+  <![CDATA[
    /**
     * Bug 1388827 / Bug 874407
     * Ensures that history views are updated properly after visits.
--- a/suite/components/places/tests/chrome/test_bug549491.xul
+++ b/suite/components/places/tests/chrome/test_bug549491.xul
@ -17,11 +17,9 @@
        title="549491: 'The root node is never visible' exception when details of the root node are modified "
        onload="runTest();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="head.js" />
+  <script src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script src="head.js" />

  <body xmlns="http://www.w3.org/1999/xhtml" />

@ -37,7 +35,8 @@
    <treechildren flex="1"/>
  </tree>

-  <script type="application/javascript"><![CDATA[
+  <script>
+  <![CDATA[
    /**
     * Bug 549491
     * https://bugzilla.mozilla.org/show_bug.cgi?id=549491
--- a/suite/components/places/tests/chrome/test_treeview_date.xul
+++ b/suite/components/places/tests/chrome/test_treeview_date.xul
@ -16,11 +16,9 @@
        title="435322: Places tree view's formatting"
        onload="runTest();">

-  <script type="application/javascript"
-          src="chrome://mochikit/content/MochiKit/packed.js" />
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="head.js" />
+  <script src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script src="head.js" />

  <body xmlns="http://www.w3.org/1999/xhtml" />

@ -42,7 +40,7 @@
    <treechildren flex="1"/>
  </tree>

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

    /**
--- a/suite/components/pref/content/pref-applicationManager.xul
+++ b/suite/components/pref/content/pref-applicationManager.xul
@ -18,10 +18,8 @@
        style="&appManager.style;"
        persist="screenX screenY">

-  <script type="application/javascript"
-          src="chrome://communicator/content/pref/pref-applications.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/pref/pref-applicationManager.js"/>
+  <script src="chrome://communicator/content/pref/pref-applications.js"/>
+  <script src="chrome://communicator/content/pref/pref-applicationManager.js"/>

  <commandset id="appManagerCommandSet">
    <command id="cmd_delete"
--- a/suite/components/pref/content/pref-languages-add.xul
+++ b/suite/components/pref/content/pref-languages-add.xul
@ -18,7 +18,7 @@
            onbeforeaccept="DoBeforeAccept();"
            ondialogaccept="return OnAccept();">

-  <script type="application/javascript" src="chrome://communicator/content/pref/pref-languages-add.js"/>
+  <script src="chrome://communicator/content/pref/pref-languages-add.js"/>

  <prefpane id="addLanguagesPane">
    <preferences id="addLanguages">
--- a/suite/components/pref/content/pref-proxies-advanced.xul
+++ b/suite/components/pref/content/pref-proxies-advanced.xul
@ -13,10 +13,8 @@
            title="&pref.proxies.advanced.title;"
            persist="screenX screenY">

-  <script type="application/javascript"
-          src="chrome://communicator/content/pref/pref-proxies.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/pref/preferences.js"/>
+  <script src="chrome://communicator/content/pref/pref-proxies.js"/>
+  <script src="chrome://communicator/content/pref/preferences.js"/>

  <prefpane helpTopic="nav-prefs-advanced-proxy-advanced"
            helpURI="chrome://communicator/locale/help/suitehelp.rdf">
--- a/suite/components/pref/content/pref-sync.xul
+++ b/suite/components/pref/content/pref-sync.xul
@ -30,10 +30,8 @@
      <preference id="engine.tabs"      name="services.sync.engine.tabs"      type="bool"/>
    </preferences>

-    <script type="application/javascript"
-            src="chrome://communicator/content/pref/pref-sync.js"/>
-    <script type="application/javascript"
-            src="chrome://communicator/content/sync/syncUtils.js"/>
+    <script src="chrome://communicator/content/pref/pref-sync.js"/>
+    <script src="chrome://communicator/content/sync/syncUtils.js"/>

      <deck id="weavePrefsDeck">
        <vbox id="noAccount" align="center">
--- a/suite/components/pref/content/preferences.xul
+++ b/suite/components/pref/content/preferences.xul
@ -30,10 +30,10 @@
            buttons="accept,cancel,help"
            autopanes="true">

-  <script type="application/javascript" src="chrome://communicator/content/pref/preferences.js"/>
+  <script src="chrome://communicator/content/pref/preferences.js"/>
  <!-- Used by pref-smartupdate, pref-privatedata, pref-cookies, pref-images, pref-popups and pref-passwords, as well as pref-sync (gSyncUtils.*open* -> openUILinkIn) -->
-  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://communicator/content/tasksOverlay.js"/>

  <stringbundleset id="prefBundleset">
    <stringbundle id="bundle_prefutilities"
--- a/suite/components/profile/content/profileSelection.xul
+++ b/suite/components/profile/content/profileSelection.xul
@ -37,8 +37,8 @@
  <stringbundle id="bundle_brand"
                src="chrome://branding/locale/brand.properties"/>

-  <script type="application/javascript" src="chrome://communicator/content/profile/profileSelection.js"/>
-  <script type="application/javascript" src="chrome://mozapps/content/profile/createProfileWizard.js"/>
+  <script src="chrome://communicator/content/profile/profileSelection.js"/>
+  <script src="chrome://mozapps/content/profile/createProfileWizard.js"/>

  <dialogheader id="header" title="&profileManager.title;" description="&windowTitle.label;"/>

--- a/suite/components/search/content/engineManager.xul
+++ b/suite/components/search/content/engineManager.xul
@ -22,8 +22,7 @@
        persist="screenX screenY width height"
        windowtype="Browser:SearchManager">

-  <script type="application/javascript"
-          src="chrome://communicator/content/search/engineManager.js"/>
+  <script src="chrome://communicator/content/search/engineManager.js"/>

  <commandset id="engineManagerCommandSet">
    <command id="cmd_remove"
--- a/suite/components/search/content/search-panel.xul
+++ b/suite/components/search/content/search-panel.xul
@ -13,9 +13,9 @@
      onload="Startup();"
      elementtofocus="sidebar-search-text">

-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/search/search-panel.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://communicator/content/search/search-panel.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>

    <popupset id="sidebarPopupset">
      <panel id="PopupAutoComplete"
--- a/suite/components/sessionstore/content/aboutSessionRestore.xhtml
+++ b/suite/components/sessionstore/content/aboutSessionRestore.xhtml
@ -24,7 +24,7 @@
    <link rel="stylesheet" href="chrome://communicator/skin/aboutSessionRestore.css" type="text/css" media="all"/>
    <link rel="icon" type="image/png" href="chrome://global/skin/icons/question-16.png"/>

-    <script type="application/javascript" src="chrome://communicator/content/aboutSessionRestore.js"/>
+    <script src="chrome://communicator/content/aboutSessionRestore.js"/>
  </head>

  <body dir="&locale.dir;">
--- a/suite/components/shell/content/setDesktopBackground.xul
+++ b/suite/components/shell/content/setDesktopBackground.xul
@ -20,8 +20,7 @@
        ondialogextra2="onApply();"
        title="&setDesktopBackground.title;">

-  <script type="text/javascript"
-          src="chrome://communicator/content/setDesktopBackground.js"/>
+  <script src="chrome://communicator/content/setDesktopBackground.js"/>

  <hbox id="itemsBox" align="center">
    <label value="&position.label;" accesskey="&position.accesskey;"/>
--- a/suite/components/sidebar/content/customize-panel.xul
+++ b/suite/components/sidebar/content/customize-panel.xul
@ -13,7 +13,8 @@
  onload="Init();"
  onunload="RefreshPanel();;">

-  <script type="application/javascript" src="chrome://communicator/content/sidebar/customize-panel.js" />
+  <script src="chrome://communicator/content/sidebar/customize-panel.js" />
+
  <browser id="customize_frame"
           type="content"
           primary="true"
--- a/suite/components/sidebar/content/customize.xul
+++ b/suite/components/sidebar/content/customize.xul
@ -31,8 +31,7 @@
  ondialogextra2="BrowseMorePanels();"
  ondialogaccept="return Save();">

-  <script type="application/javascript"
-          src="chrome://communicator/content/sidebar/customize.js"/>
+  <script src="chrome://communicator/content/sidebar/customize.js"/>

  <hbox flex="1">
    <vbox flex="1">
--- a/suite/components/sidebar/content/preview.xul
+++ b/suite/components/sidebar/content/preview.xul
@ -17,7 +17,7 @@
        onload="Init();"
        title="&sidebar.preview.title.label;">

-  <script type="application/javascript" src="chrome://communicator/content/sidebar/preview.js" />
+  <script src="chrome://communicator/content/sidebar/preview.js" />

  <vbox id="panel-container" flex="1">

--- a/suite/components/sidebar/content/sidebarOverlay.xul
+++ b/suite/components/sidebar/content/sidebarOverlay.xul
@ -241,8 +241,7 @@
  </menupopup>

  <!-- Scripts go last, because they peek at state to tweak menus -->
-  <script type="application/javascript"
-    src="chrome://communicator/content/sidebar/sidebarOverlay.js"/>
+  <script src="chrome://communicator/content/sidebar/sidebarOverlay.js"/>

 </overlay>

--- a/suite/components/sync/content/aboutSyncTabs.xul
+++ b/suite/components/sync/content/aboutSyncTabs.xul
@ -17,8 +17,10 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml"
        title="&tabs.otherComputers.label;">
-  <script type="application/javascript" src="chrome://communicator/content/aboutSyncTabs.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+
+  <script src="chrome://communicator/content/aboutSyncTabs.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+
  <html:head>
    <html:link rel="icon" href="chrome://communicator/skin/sync/sync-16.png"/>
  </html:head>
--- a/suite/components/sync/content/syncAddDevice.xul
+++ b/suite/components/sync/content/syncAddDevice.xul
@ -27,14 +27,10 @@
        onwizardcancel="gSyncAddDevice.onWizardCancel();"
        onload="gSyncAddDevice.init();">

-  <script type="application/javascript"
-          src="chrome://communicator/content/sync/syncAddDevice.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/sync/syncUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://communicator/content/sync/syncAddDevice.js"/>
+  <script src="chrome://communicator/content/sync/syncUtils.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/printUtils.js"/>

  <wizardpage id="addDevicePage"
              label="&addDevice.title.label;"
--- a/suite/components/sync/content/syncGenericChange.xul
+++ b/suite/components/sync/content/syncGenericChange.xul
@ -24,12 +24,9 @@
        onwizardnext="Change.onLoad();"
        onwizardfinish="return Change.onDialogAccept();">

-  <script type="application/javascript"
-          src="chrome://communicator/content/sync/syncGenericChange.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/sync/syncUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://communicator/content/sync/syncGenericChange.js"/>
+  <script src="chrome://communicator/content/sync/syncUtils.js"/>
+  <script src="chrome://global/content/printUtils.js"/>

  <wizardpage id="change-page"
              label="">
--- a/suite/components/sync/content/syncQuota.xul
+++ b/suite/components/sync/content/syncQuota.xul
@ -26,8 +26,7 @@
        title="&quota.dialogTitle.label;"
        ondialogaccept="return gSyncQuota.onAccept();">

-  <script type="application/javascript"
-          src="chrome://communicator/content/sync/syncQuota.js"/>
+  <script src="chrome://communicator/content/sync/syncQuota.js"/>

  <stringbundleset id="stringbundleset">
    <stringbundle id="quotaStrings"
--- a/suite/components/sync/content/syncSetup.xul
+++ b/suite/components/sync/content/syncSetup.xul
@ -27,14 +27,10 @@
        onwizardcancel="gSyncSetup.onWizardCancel();"
        onload="gSyncSetup.init();">

-  <script type="application/javascript"
-          src="chrome://communicator/content/sync/syncSetup.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/sync/syncUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://communicator/content/sync/syncSetup.js"/>
+  <script src="chrome://communicator/content/sync/syncUtils.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/printUtils.js"/>

  <wizardpage id="pickSetupType"
              label="&syncBrand.fullName.label;"
--- a/suite/components/tests/browser/browser_339445_sample.html
+++ b/suite/components/tests/browser/browser_339445_sample.html
@ -10,7 +10,7 @@ storageTestItem = <span id="storageTestItem">FAIL</span>
  * SUCCESS : the test value was correctly retrieved
 -->

-<script type="application/javascript">
+<script>
  document.getElementById("storageTestItem").textContent =
    sessionStorage["storageTestItem"] || "PENDING";
  sessionStorage["storageTestItem"] = "SUCCESS";
--- a/Показать больше
+++ b/Показать больше