Bug 65428 language="javascript" should be type="application/x-javascript"

r=ksosez@softhome.net a=ben

editor/ui/composer/content/EditorContextMenuOverlay.xul

@@ -26,7 +26,7 @@
 <overlay id="ComposerContextMenuOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script language="JavaScript" src="chrome://editor/content/EditorContextMenu.js"/>
+<script type="application/x-javascript" src="chrome://editor/content/EditorContextMenu.js"/>
 
 <popupset id="editorContentContextSet">
  <popup id="editorContentContext"   

editor/ui/composer/content/TextEditorAppShell.xul

@@ -46,10 +46,10 @@
         persist="screenX screenY width height"
         >
 
-  <script language="JavaScript" src="chrome://editor/content/editor.js"/>
-  <script language="JavaScript" src="chrome://editor/content/ComposerCommands.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EditorCommandsDebug.js"/>
-  <script language="javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <commands id="commands">
     <commandset id="globalEditMenuItems"/>

editor/ui/composer/content/editor.xul

@@ -53,20 +53,20 @@
         persist="screenX screenY width height sizemode"
         >
 
-  <script type="text/javascript" src="chrome://editor/content/editor.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
 <!-- 
   Loaded by editorOverlay.js
-  <script type="text/javascript" src="chrome://editor/content/ComposerCommands.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
 -->
-  <script type="text/javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
-  <script type="text/javascript" src="chrome://editor/content/EditorContextMenu.js"/>
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-  <script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-  <script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-  <script type="text/javascript" src="chrome://global/content/nsTransferable.js"/>
-  <script type="text/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditorContextMenu.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <popupset id="aTooltipSet" />
   <popupset id="editorContentContextSet"/>

editor/ui/composer/content/editorOverlay.xul

@@ -31,8 +31,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script language="JavaScript" src="chrome://editor/content/editorOverlay.js"/>
-<script language="JavaScript" src="chrome://editor/content/ComposerCommands.js"/>
+<script type="application/x-javascript" src="chrome://editor/content/editorOverlay.js"/>
+<script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
 
   <!--keyset id="platformOverlayKeyset" /--> <!-- Don't do that, only one keyset per window! Anyway, this keyset is not defined! -->
 

editor/ui/composer/content/editorPrefsOverlay.xul

@@ -10,7 +10,7 @@
 <overlay id="editorPrefsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var panel;
     if (panel != undefined) {

editor/ui/composer/content/pref-composer.xul

@@ -35,10 +35,10 @@
   		  onload="parent.initPanel('chrome://editor/content/pref-composer.xul');">
 
   <!-- We need these for separator "thin" class -->
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="JavaScript" src="chrome://communicator/content/pref/prefutilities.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <!-- Add "shouldAutoSave", "autoSaveAmount" to _elementIDs when implemented -->
   <![CDATA[
     var _elementIDs = ["maintainTableStructure", "tableDeleteKey", "preserveFormatting", "recentFiles"];
@@ -203,7 +203,4 @@
 
   </titledbox>
   -->
-
-  
 </window>
-

editor/ui/composer/content/pref-editing.xul

@@ -39,10 +39,10 @@
   ]]>
   </script>
 
-  <script language="JavaScript" src="chrome://editor/content/pref-composer.js"></script>
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://global/content/strres.js"></script>
-  <script language="JavaScript" src="chrome://communicator/content/pref/prefutilities.js"></script>
+  <script type="application/x-javascript" src="chrome://editor/content/pref-composer.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
         
   <box class="box-smallheader" title="&lHeader;"/>
 
@@ -165,6 +165,4 @@
     </box>
 
  	</titledbox>
-    
 </window>
-

editor/ui/dialogs/content/EdAdvancedEdit.xul

@@ -44,16 +44,16 @@
   <popupset id="aTooltipSet" />
     
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <!-- global dialog functions -->
-  <script language="JavaScript" src="chrome://editor/content/EdAdvancedEdit.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdAdvancedEdit.js"/>
   <!-- element page functions -->
-  <script language="JavaScript" src="chrome://editor/content/EdAEHTMLAttributes.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdAECSSAttributes.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdAEJSEAttributes.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdAEHTMLAttributes.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdAECSSAttributes.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdAEJSEAttributes.js"/>
 
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
-	<script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
   <broadcaster id="args" value=""/>
 

editor/ui/dialogs/content/EdColorPicker.xul

@@ -35,10 +35,10 @@
     orient="vertical"
     >
 
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdColorPicker.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
-  <script language="javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdColorPicker.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <broadcaster id="args" value=""/>
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdColorProps.xul

@@ -38,9 +38,9 @@
     onload="Startup()"
     orient="vertical">
 
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdColorProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdColorProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdDialogTemplate.xul

@@ -37,9 +37,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/Ed?????.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/Ed?????.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdDictionary.xul

@@ -31,8 +31,8 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdDictionary.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDictionary.js"/>
   
   <broadcaster id="args" value=""/>
   <spring id="location" offsetX="10" offsetY="10" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdHLineProps.xul

@@ -39,10 +39,10 @@
    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
   <!--- Element-specific methods -->
-  <script language="JavaScript" src="chrome://editor/content/EdHLineProps.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdHLineProps.js"/>
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keyset"/>

editor/ui/dialogs/content/EdImageMap.xul

@@ -50,12 +50,12 @@
 -->
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js" />
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js" />
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <!-- Methods for Image Map only -->
-  <script language="JavaScript" src="chrome://editor/content/EdImageMap.js" />
-  <script language="JavaScript" src="chrome://editor/content/EdImageMapShapes.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdImageMap.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdImageMapShapes.js" />
 
   <broadcaster id="args" value=""/>
 

editor/ui/dialogs/content/EdImageMapHotSpot.xul

@@ -37,10 +37,10 @@
 	>
 
   <!-- Methods common to all editor dialogs -->
-  <script type="text/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="text/javascript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
 
-  <script type="text/javascript" src="chrome://editor/content/EdImageMapHotSpot.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdImageMapHotSpot.js"/>
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdImageProps.xul

@@ -43,10 +43,10 @@
     id="imagedialog"
     >
   
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdImageProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js"/>
-  <script language="JavaScript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdImageProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdInsSrc.xul

@@ -37,9 +37,9 @@
     orient="vertical" flex="1">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdInsSrc.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdInsSrc.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdInsertChars.xul

@@ -36,9 +36,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdInsertChars.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdInsertChars.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keyset"/>

editor/ui/dialogs/content/EdInsertTable.xul

@@ -40,9 +40,9 @@
     align="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdInsertTable.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdInsertTable.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdLinkProps.xul

@@ -37,9 +37,9 @@
    onload = "Startup()"
    orient="vertical" >
 
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdLinkProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdLinkProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <broadcaster id="args" value=""/>
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdListProps.xul

@@ -35,9 +35,9 @@
     align="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdListProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdListProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <keyset id="keyset"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdNamedAnchorProps.xul

@@ -39,9 +39,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdNamedAnchorProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdNamedAnchorProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keyset"/>

editor/ui/dialogs/content/EdPageProps.xul

@@ -37,9 +37,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdPageProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdPageProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdSpellCheck.xul

@@ -34,9 +34,9 @@
     onclose = "onClose()"
     orient="vertical">
 
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdSpellCheck.js"/>
-  <script language="Javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdSpellCheck.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keys">

editor/ui/dialogs/content/EdTableProps.xul

@@ -38,9 +38,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdTableProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdTableProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EditConflict.xul

@@ -37,9 +37,9 @@
    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EditConflict.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditConflict.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keyset"/>

editor/ui/dialogs/content/EditorSaveAsCharset.xul

@@ -39,9 +39,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

embedding/browser/chrome/content/mini-nav.xul

@@ -39,7 +39,7 @@ Contributor(s): ______________________________________. -->
   onload="MiniNavStartup()"
   onunload="MiniNavShutdown()">
 
-  <script language="javascript" src="chrome://embed/content/mini-nav.js"/>
+  <script type="application/x-javascript" src="chrome://embed/content/mini-nav.js"/>
 
   <!-- Context menu -->
   <popupset>

extensions/cookie/resources/content/cookieContextOverlay.xul

@@ -27,9 +27,9 @@
 <overlay id="cookieContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     // Code from nsContextMenu.js. Note that we extend the prototype here, rather 

extensions/cookie/resources/content/cookieTasksOverlay.xul

@@ -27,9 +27,9 @@
 <overlay id="cookieTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     // Remove the image entries from the task menu

extensions/cookie/resources/content/pref-cookies.xul

@@ -35,7 +35,7 @@
         align="vertical"
         onload="parent.initPanel('chrome://cookie/content/pref-cookies.xul');">
           
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
   <script>
   <![CDATA[

extensions/cookie/resources/content/pref-images.xul

@@ -35,9 +35,9 @@
         align="vertical"
         onload="imageBlockingEnabled(); parent.initPanel('chrome://cookie/content/pref-images.xul');">
           
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
   
   var _elementIDs = ["accOrgImages", "networkImageBehaviour", "networkImageWarnAboutImages"];

extensions/cview/resources/content/cview.xul

@@ -60,13 +60,13 @@
     cview-static.js    Non event-handler functions core to cview.
     cview-handlers.js  Event-handlers core to cview.
 -->
-  <html:script>
+  <script>
     var DEBUG = true;
-  </html:script>
-  <html:script src="chrome://cview/content/cview-utils.js"/>
-  <html:script src="chrome://cview/content/cview-rdf.js"/>
-  <html:script src="chrome://cview/content/cview-static.js"/>
-  <html:script src="chrome://cview/content/cview-handlers.js"/>
+  </script>
+  <script type="application/x-javascript" src="chrome://cview/content/cview-utils.js"/>
+  <script type="application/x-javascript" src="chrome://cview/content/cview-rdf.js"/>
+  <script type="application/x-javascript" src="chrome://cview/content/cview-static.js"/>
+  <script type="application/x-javascript" src="chrome://cview/content/cview-handlers.js"/>
 
 <!--
   This popup is the context menu for elements in the interfaces list.

extensions/cview/resources/content/cviewOverlay.xul

@@ -36,7 +36,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript"
+<script type="application/x-javascript"
   src="chrome://cview/content/cviewOverlay.js"/>
 
 <!--

extensions/help/resources/content/help.xul

@@ -16,7 +16,7 @@
         persist="width height screenX screenY"
         onload="init();" >
 
-  <script type="text/javascript" src="chrome://help/content/help.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <box orient="vertical" flex="1">
 

extensions/inspector/resources/content/inspector.xul

@@ -18,7 +18,7 @@
         width="1024" height="768" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="Javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
 
   <popupset id="psTooltipSet">
     <popup id="ppTooltip" class="tooltip" oncreate="return inspector.fillInTooltip(document.tooltipNode);"> 
@@ -40,4 +40,4 @@
   <box id="bxStatus"/>
 </window>
 
-        
+        

extensions/inspector/resources/content/inspectorOverlay.xul

@@ -9,25 +9,25 @@
          xmlns:ins="&INS-rdf;"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://inspector/content/InspectorApp.js"/>
-  <script language="javascript" src="chrome://inspector/content/ViewerRegistry.js"/>
-  <script language="javascript" src="chrome://inspector/content/ViewerPane.js"/>
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/Flasher.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFArray.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/FrameExchange.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/ClipboardUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/PrefUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/file.js"/>
-  <script language="javascript" src="chrome://inspector/content/search/inSearchService.js"/>
-  <script language="javascript" src="chrome://inspector/content/search/inSearchModule.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/inFormManager.js"/>
-  <script language="javascript" src="chrome://inspector/content/search/inSearchUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/search/inSearchTreeBuilder.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/InspectorApp.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/ViewerRegistry.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/ViewerPane.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/Flasher.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFArray.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/FrameExchange.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/ClipboardUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/PrefUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/file.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchService.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchModule.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inFormManager.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchTreeBuilder.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
 
   <box id="bxInspectorMain" orient="vertical">
 
@@ -73,8 +73,5 @@
       <!-- TEMPORARY UNTIL FIX FOR 54237 -->
       <browser id="inSearchServiceLoader" height="1"/>
     </box>
-
   </box>
-  
 </overlay>
-

extensions/inspector/resources/content/prefs/pref-inspector.xul

@@ -8,9 +8,9 @@
 <window id="winPref" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/extensions/wsm-colorpicker.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/extensions/wsm-colorpicker.js"/>
 
-  <script language="Javascript"><![CDATA[
+  <script type="application/x-javascript"><![CDATA[
     var _elementIDs = [
       "cprElBorderColor",
       "txfElBorderWidth",
@@ -26,7 +26,7 @@
 
     AddColorPicker(initFunction);
 
-  ]]></script>
+  ]]/>
 
   <box class="box-smallheader" title="&Inspector.label;"/>
 
@@ -80,7 +80,4 @@
       </box>
     </titledbox>
   </box>
-
 </window>
-
-        

extensions/inspector/resources/content/prefs/pref-sidebar.xul

@@ -8,9 +8,9 @@
 <window id="winPrefSidebar" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="Javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="Javascript" src="chrome://inspector/content/prefs/pref-sidebar.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/prefs/pref-sidebar.js"/>
 
   <box class="box-smallheader" title="&Sidebar.label;"/>
 
@@ -23,7 +23,4 @@
       <button value="Install" onclick="gSidebarPrefs.installSidebar()"/>
     </box>
   </box>
-
 </window>
-
-        

extensions/inspector/resources/content/prefs/prefs.xul

@@ -11,7 +11,7 @@
         width="550" height="400" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/prefs/InspectorPrefs.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/prefs/InspectorPrefs.js"/>
 
   <tabcontrol flex="1">
     <tabbox id="tbxPrefs"/>
@@ -19,7 +19,4 @@
   </tabcontrol>
 
   <box id="okCancelButtonsRight"/>
-
 </window>
-
-        

extensions/inspector/resources/content/search/modules/findFiles/dialog.xul

@@ -13,9 +13,9 @@
         orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/search/modules/findFiles/dialog.js"/>
-  <script language="Javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/modules/findFiles/dialog.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
   
   <box orient="vertical">
     <box autostretch="never">
@@ -33,6 +33,4 @@
   </box>
 
   <box id="okCancelButtonsRight"/>
-
 </window>
-

extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul

@@ -13,9 +13,9 @@
         orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/search/modules/junkImgs/dialog.js"/>
-  <script language="Javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/modules/junkImgs/dialog.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
 
   <box orient="vertical">
     <html style="width: 400px">&junkImgsDescription;</html>
@@ -36,7 +36,4 @@
   </box>
 
   <box id="okCancelButtonsRight"/>
-
 </window>
-
-        

extensions/inspector/resources/content/sidebar/sidebar.xul

@@ -17,15 +17,15 @@
         title="Document Inspector" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="Javascript" src="chrome://inspector/content/sidebar/InspectorSidebar.js"/>
-  <script language="javascript" src="chrome://inspector/content/ViewerRegistry.js"/>
-  <script language="javascript" src="chrome://inspector/content/ViewerPane.js"/>
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFArray.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/FrameExchange.js"/>
-  <script language="javascript" src="chrome://inspector/content/Flasher.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/sidebar/InspectorSidebar.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/ViewerRegistry.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/ViewerPane.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFArray.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/FrameExchange.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/Flasher.js"/>
 
 
   <popupset id="psTooltipSet">
@@ -63,5 +63,3 @@
     </tabpanel>
   </tabcontrol>
 </window>
-
-        

extensions/inspector/resources/content/tasksOverlay.xul

@@ -5,7 +5,7 @@
 <overlay id="eInspectorTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript">
+  <script type="application/x-javascript">
     
     function launchInspector()
     {

extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul

@@ -12,11 +12,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/computedStyle/computedStyle.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/computedStyle/computedStyle.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
 
   <text value="Not Yet Implemented"/>
-
 </window>
-
-        

extensions/inspector/resources/content/viewers/dom/columnsDialog.xul

@@ -9,16 +9,14 @@
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/dom/columnsDialog.js"/>
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/dom/columnsDialog.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
 
   <box id="bxColumns" flex="1" orient="vertical"
     ondragdrop="dialog.onDragDropIn(event);"
     ondraggesture="dialog.onDragGesture(event);"/>
-    
 </window>
-

extensions/inspector/resources/content/viewers/dom/dom.xul

@@ -14,13 +14,13 @@
         xmlns:ins="http://www.mozilla.org/inspector#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/dom/dom.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/PrefUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/dom/dom.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/PrefUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
 
   <!--============================= COMMANDS ============================== -->
 
@@ -53,7 +53,4 @@
     containment="&INS-rdf;HasChildren" flags="dont-test-empty">
     <template/>
   </tree>
-
 </window>
-
-        

extensions/inspector/resources/content/viewers/dom/findDialog.xul

@@ -11,9 +11,9 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/dom/FindDialog.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/dom/FindDialog.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
 
   <broadcasterset id="brsBroadcasters">
     <broadcaster id="cmdFind" oncommand="dialog.doFind()" onkeypress="if (event.keyCode == 13) dialog.doFind()"/>
@@ -65,5 +65,3 @@
     <button value="Close" observes="cmdClose"/>
   </box>
 </window>
-
-        

extensions/inspector/resources/content/viewers/jsObject/jsObject.xul

@@ -12,11 +12,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/jsObject/jsObject.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/jsObject/jsObject.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
 
   <text value="Not Yet Implemented"/>
-
 </window>
-
-        

extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul

@@ -15,11 +15,11 @@
   
   <!--============================= SCRIPTS ============================= -->
 
-  <script language="javascript" src="chrome://inspector/content/viewers/nodeElement/nodeElement.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/nodeElement/nodeElement.js"/>
 
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
 
   <!--============================= POPUPS ============================== -->
 
@@ -106,5 +106,3 @@
   </tree>
 
 </window>
-
-        

extensions/inspector/resources/content/viewers/nodeText/nodeText.xul

@@ -12,9 +12,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/nodeText/nodeText.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/nodeText/nodeText.js"/>
 
   <textfield id="txNodeValue" readonly="true" multiline="true" flex="1"/>
-
 </window>
-

extensions/inspector/resources/content/viewers/styleRules/styleRules.xul

@@ -15,11 +15,11 @@
   
   <!--============================= SCRIPTS ============================= -->
 
-  <script language="javascript" src="chrome://inspector/content/viewers/styleRules/styleRules.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/styleRules/styleRules.js"/>
 
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
 
   <!--============================= POPUPS ============================== -->
 
@@ -156,5 +156,3 @@
   </tree>    
 
 </window>
-
-        

extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul

@@ -12,11 +12,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/stylesheets/stylesheets.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/stylesheets/stylesheets.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
 
   <text value="Not Yet Implemented"/>
-
 </window>
-
-        

extensions/inspector/resources/content/viewers/xblBindings/xblBindings.xul

@@ -12,11 +12,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/xblBindings/xblBindings.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/xblBindings/xblBindings.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
 
   <text value="Not Yet Implemented"/>
-
 </window>
-
-        

extensions/irc/xul/content/chatzillaOverlay.xul

@@ -8,7 +8,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript" src="chrome://chatzilla/content/chatzillaOverlay.js"/>
+<script type="application/x-javascript" src="chrome://chatzilla/content/chatzillaOverlay.js"/>
 
 <keyset id="keyset">
   <key id="key_irc"  key="&ircCmd.commandkey;" observes="Tasks:IRC" modifiers="accel"/>

extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul

@@ -36,8 +36,8 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         align="vertical" onload="onLoadTransformiix();">
 
-<script language="javascript" src="chrome://Transformiix/content/transformiix.js"/>
-<script language="javascript" src="resource:/res/samples/DumpDOM.js"/>
+<script type="application/x-javascript" src="chrome://Transformiix/content/transformiix.js"/>
+<script type="application/x-javascript" src="resource:/res/samples/DumpDOM.js"/>
 
 <box id="tool-box" flex="1" align="horizontal">
 </box>

extensions/vixen/resources/content/vfdCommands.xul

@@ -26,8 +26,8 @@
 <overlay id="vfdCommandsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="JavaScript" src="chrome://global/content/nsJSComponentManager.js"></script>
-  <script language="JavaScript" src="chrome://vixen/content/vfdCommands.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://vixen/content/vfdCommands.js"/>
   
   <commandset id="vfdCommands"
               commandupdate="true"
@@ -90,4 +90,4 @@
   </commandset>
             
           
-</overlay>          
+</overlay>          

extensions/vixen/resources/content/vixen.xul

@@ -39,12 +39,12 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="vxShell.startup();" onunload="vxShell.shutdown();">
   
-  <script language="JavaScript" src="chrome://global/content/nsJSComponentManager.js"></script>
-  <script language="JavaScript" src="chrome://global/content/globalOverlay.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
 
-  <script language="JavaScript" src="chrome://vixen/content/vxKeysetOverlay.js"></script>
-  <script language="JavaScript" src="chrome://vixen/content/vixen.js"></script>
-  <script language="JavaScript" src="chrome://vixen/content/vxUtils.js"></script>
+  <script type="application/x-javascript" src="chrome://vixen/content/vxKeysetOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://vixen/content/vixen.js"/>
+  <script type="application/x-javascript" src="chrome://vixen/content/vxUtils.js"/>
 
   <keyset id="keyset"/>
   
@@ -79,7 +79,4 @@
       <button class="button-toolbar" value="Dump DOM" oncommand="XXX_dumpDOM();"/>
     </toolbar>
   </toolbox>
-          
 </window>
-
-        

extensions/vixen/resources/content/xe_NavOverlay.xul

@@ -27,7 +27,7 @@
 <overlay id="dsjlaskjd"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script language="JavaScript">
+<script type="application/x-javascript">
 <![CDATA[
 function loadXULEdit()
 {

extensions/wallet/editor/WalletAddress.xul

@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["street.line1", "street.line2", "street.line3",
                        "city", "state", "postalcode.prefix", "postalcode.suffix", "country",
@@ -44,7 +44,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/WalletBilling.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/WalletConcatenated.xul

@@ -37,7 +37,7 @@
         style="overflow: auto;"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["name",
                        "home.postalcode",
@@ -59,7 +59,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/WalletCredit.xul

@@ -36,14 +36,14 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["card.type", "card.number",
                        "card.expdate.month", "card.expdate.year", "card.name"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/WalletEditor.xul

@@ -36,8 +36,8 @@
         orient="vertical"
         onload="Startup()">
 
-  <script src="chrome://communicator/content/wallet/WalletEditor.js"/>
-  <script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletEditor.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
   <keyset id="keyset"/>
            
     <box id="system" flex="100%" orient="vertical">

extensions/wallet/editor/WalletEmploy.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["business.companyname", "business.jobtitle", "business.department"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/WalletMisc.xul

@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["socsec.prefix", "socsec.middle", "socsec.suffix",
                        "license.number", "license.state", "mothersmaidenname",
@@ -45,7 +45,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/WalletName.xul

@@ -36,14 +36,14 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs =
       ["name.prefix", "name.first", "name.middle", "name.last", "name.suffix"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/WalletOther.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/WalletPhone.xul

@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["phone.loccode", "phone.number.prefix", "phone.number.suffix", "phone.extension",
                        "altphone.loccode", "altphone.number.prefix", "altphone.number.suffix", "altphone.extension",
@@ -46,7 +46,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/WalletPrimary.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/WalletShipping.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/WalletUrlspecific.xul

@@ -36,7 +36,7 @@
         orient="vertical"
         onload="generate();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
 
@@ -81,7 +81,7 @@
 
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never" orient="vertical">

extensions/wallet/editor/WalletViewer.xul

@@ -43,8 +43,8 @@
   
   </script>        
         
-  <script language="javascript" src="chrome://communicator/content/wallet/WalletViewer.js"></script>
-  <script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletViewer.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
   <keyset id="keyset"/>
 
@@ -53,7 +53,7 @@
     <tree class="inset" id="panelTree" style="width: 0px" flex="3"/>      
 
     <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
-    <script language="JavaScript">
+    <script type="application/x-javascript">
     <![CDATA[
       document.getElementById("panelFrame").setAttribute("src", "chrome://communicator/content/wallet/WalletName.xul");
       document.getElementById("panelFrame").setAttribute("tag", "" );

extensions/wallet/editor/privacy.xul

@@ -36,7 +36,7 @@
         onload="TutorialURL()" 
         orient="vertical">
 <!-- 
-  <script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 -->
 
   <script>

extensions/wallet/editor/resources/content/WalletAddress.xul

@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["street.line1", "street.line2", "street.line3",
                        "city", "state", "postalcode.prefix", "postalcode.suffix", "country",
@@ -44,7 +44,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/resources/content/WalletBilling.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/resources/content/WalletConcatenated.xul

@@ -37,7 +37,7 @@
         style="overflow: auto;"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["name",
                        "home.postalcode",
@@ -59,7 +59,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/resources/content/WalletCredit.xul

@@ -36,14 +36,14 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["card.type", "card.number",
                        "card.expdate.month", "card.expdate.year", "card.name"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/resources/content/WalletEmploy.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["business.companyname", "business.jobtitle", "business.department"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/resources/content/WalletMisc.xul

@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["socsec.prefix", "socsec.middle", "socsec.suffix",
                        "license.number", "license.state", "mothersmaidenname",
@@ -45,7 +45,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/resources/content/WalletName.xul

@@ -36,14 +36,14 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs =
       ["name.prefix", "name.first", "name.middle", "name.last", "name.suffix"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/resources/content/WalletOther.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/resources/content/WalletPhone.xul

@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["phone.loccode", "phone.number.prefix", "phone.number.suffix", "phone.extension",
                        "altphone.loccode", "altphone.number.prefix", "altphone.number.suffix", "altphone.extension",
@@ -46,7 +46,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">

extensions/wallet/editor/resources/content/WalletPrimary.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/resources/content/WalletShipping.xul

@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 

extensions/wallet/editor/resources/content/WalletUrlspecific.xul

@@ -36,7 +36,7 @@
         orient="vertical"
         onload="generate();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
 
@@ -81,7 +81,7 @@
 
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never" orient="vertical">

extensions/wallet/editor/resources/content/WalletViewer.xul

@@ -43,8 +43,8 @@
   
   </script>        
         
-  <script language="javascript" src="chrome://communicator/content/wallet/WalletViewer.js"></script>
-  <script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletViewer.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
   <keyset id="keyset"/>
 
@@ -53,7 +53,7 @@
     <tree class="inset" id="panelTree" style="width: 0px" flex="3"/>      
 
     <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
-    <script language="JavaScript">
+    <script type="application/x-javascript">
     <![CDATA[
       document.getElementById("panelFrame").setAttribute("src", "chrome://communicator/content/wallet/WalletName.xul");
       document.getElementById("panelFrame").setAttribute("tag", "" );

extensions/wallet/resources/content/pref-passwords.xul

@@ -34,13 +34,13 @@
         orient="vertical" title="&window.title;"
         onload="parent.initPanel('chrome://wallet/content/pref-passwords.xul');">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["signonRememberSignons", "encryptEnabled"];
   ]]>
   </script>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     function viewSignons()
     {

extensions/wallet/resources/content/pref-wallet.xul

@@ -34,15 +34,15 @@
         orient="vertical" title="&window.title;"
         onload="parent.initPanel('chrome://wallet/content/pref-wallet.xul');">
 
-  <script language="javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["walletCaptureForms"];
   ]]>
   </script>
           
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function viewWalletSites()

extensions/wallet/resources/content/walletContextOverlay.xul

@@ -27,9 +27,9 @@
 <overlay id="walletContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function initContextItems() {

extensions/wallet/resources/content/walletNavigatorOverlay.xul

@@ -27,9 +27,9 @@
 <overlay id="walletNavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function initEditItems() {

extensions/wallet/resources/content/walletTasksOverlay.xul

@@ -27,9 +27,9 @@
 <overlay id="walletTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function HideWallet() {
@@ -226,6 +226,4 @@
       </menupopup>
     </menu>
   </menupopup>
-
 </overlay>
-

extensions/wallet/walletpreview/WalletPreview.xul

@@ -33,8 +33,8 @@
         class="dialog"
         onload="Startup()">
 
-  <html:script src="chrome://global/content/strres.js" />
-  <html:script src="chrome://communicator/content/wallet/WalletPreview.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletPreview.js"/>
 
   <keyset id="keyset"/>
            

extensions/xmlterm/ui/content/xmlterm2.xul

@@ -31,7 +31,7 @@
         onload="StartupXMLTerm();"
         title="xmlterm2" align="vertical" width="740" height="484">
   
-  <html:script src="chrome://xmlterm/content/XMLTermChrome.js"></html:script>
+  <script type="application/x-javascript" src="chrome://xmlterm/content/XMLTermChrome.js"/>
 
   <html:iframe id="content-frame2" type="content" html:name="content2"
                html:src="about:blank" flex="100%"/>

extensions/xmlterm/ui/content/xmltermOverlay.xul

@@ -8,7 +8,7 @@
      xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript" src="chrome://xmlterm/content/xmltermOverlay.js"/>
+<script type="application/x-javascript" src="chrome://xmlterm/content/xmltermOverlay.js"/>
 
 <keyset id="keyset">
   <key id="key_xmlterm"  key="&xmltermCmd.commandkey;"

netwerk/resources/content/PSMTaskMenu.xul

@@ -6,7 +6,7 @@
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
     function displaySecurityAdvisor()
     {
       var psm = Components.classes["@mozilla.org/psm;1"].getService();

netwerk/resources/content/securityOverlay.xul

@@ -7,7 +7,7 @@
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript" src="chrome://communicator/content/securityUI.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/securityUI.js" />
 
   <statusbarpanel id="security-button" onclick="displayPageInfo()" tooltip="aTooltip" tooltiptext="&lockIcon.label;"/>    
       

profile/Acctidl/am.xul

@@ -10,7 +10,7 @@
 
 <html:div flex="100%">
 
-<html:script>
+<script>
 var Account = Components.classes["@mozilla.org/profile/Account-services;1"].createInstance();
 Account = Account.QueryInterface(Components.interfaces.nsIAccountServices);
 dump("Account = " + Account + "\n");
@@ -171,7 +171,7 @@ function addOptions2(oname, iname)
 	dump( "newsel="+newsel+"\n" );
 }
 
-</html:script>
+</script>
 
     
 <html:br/>

profile/Acctidl/am2.xul

@@ -10,7 +10,7 @@
 
 <html:div flex="100%">
 
-<html:script>
+<script>
 var Account = Components.classes["@mozilla.org/profile/Account-services;1"].createInstance();
 Account = Account.QueryInterface(Components.interfaces.nsIAccountServices);
 dump("Account = " + Account + "\n");
@@ -128,7 +128,7 @@ function addOptions2(oname, iname)
 }
 
 
-</html:script>
+</script>
 
 <html:br/>
     <html:select id="y">

profile/Acctidl/am2a.xul

@@ -10,7 +10,7 @@
 
 <html:div flex="100%">
 
-<html:script>
+<script>
 var Account = Components.classes["@mozilla.org/profile/Account-services;1"].createInstance();
 Account = Account.QueryInterface(Components.interfaces.nsIAccountServices);
 dump("Account = " + Account + "\n");
@@ -154,7 +154,7 @@ function SelectCity()
 	var filel = document.getElementById("filename");
 	filel.value = opt.label;
 }
-</html:script>
+</script>
 
     <html:select id="x">
         <html:option> </html:option>