Bug 520901 - "Switch application/x-javascript to application/javascript, Composer part" [r=bugspam.Callek]

editor/ui/composer/content/EditorContextMenuOverlay.xul

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

editor/ui/composer/content/editor.xul

@@ -78,15 +78,15 @@
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EditorContextMenu.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/StructBarContextMenu.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/editorApplicationOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/publishprefs.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editor.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EditorContextMenu.js"/>
+  <script type="application/javascript" src="chrome://editor/content/StructBarContextMenu.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorApplicationOverlay.js"/>
+  <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <popupset id="editorContentContextSet"/>
   <popup id="sidebarPopup"/>

editor/ui/composer/content/editorMailOverlay.xul

@@ -6,7 +6,7 @@
 <overlay id="editorMailOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="editorApplicationOverlay.js"/>
+  <script type="application/javascript" src="editorApplicationOverlay.js"/>
 
   <!-- navigator specific commands -->
   <commandset id="tasksCommands">

editor/ui/composer/content/editorNavigatorOverlay.xul

@@ -6,7 +6,7 @@
 <overlay id="editorNavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="editorApplicationOverlay.js"/>
+  <script type="application/javascript" src="editorApplicationOverlay.js"/>
 
   <!-- navigator specific commands -->
   <commandset id="tasksCommands">

editor/ui/composer/content/editorOverlay.xul

@@ -51,8 +51,8 @@
 <overlay id="editorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-<script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
+<script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+<script type="application/javascript" src="chrome://editor/content/ComposerCommands.js"/>
 
   <keyset id="editorKeys">
     <!-- defined in globalOverlay -->

editor/ui/composer/content/editorTasksOverlay.xul

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

editor/ui/dialogs/content/EdAdvancedEdit.xul

@@ -57,16 +57,16 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <!-- element page functions -->
-  <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 type="application/x-javascript" src="chrome://editor/content/EdAEAttributes.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdAEHTMLAttributes.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdAECSSAttributes.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdAEJSEAttributes.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdAEAttributes.js"/>
 
   <!-- global dialog functions -->
-  <script type="application/x-javascript" src="chrome://editor/content/EdAdvancedEdit.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdAdvancedEdit.js"/>
 
   <broadcaster id="args" value=""/>
 

editor/ui/dialogs/content/EdButtonProps.xul

@@ -49,9 +49,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdButtonProps.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdButtonProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdColorPicker.xul

@@ -49,9 +49,9 @@
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancelColor();">
 
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdColorPicker.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdColorProps.xul

@@ -50,9 +50,9 @@
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
 
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdColorProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdConvertToTable.xul

@@ -52,10 +52,10 @@
    style="min-width:20em">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
-  <script type="application/x-javascript" src="chrome://editor/content/EdConvertToTable.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdConvertToTable.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <description class="wrap" flex="1">&instructions1.label;</description>

editor/ui/dialogs/content/EdDialogTemplate.xul

@@ -51,10 +51,10 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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" />
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/Ed?????.js"/>
+  <script type="application/javascript" src="chrome://global/content/dialogOverlay.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdDictionary.xul

@@ -46,9 +46,9 @@
     ondialogcancel="return onClose();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDictionary.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDictionary.js"/>
   
   <broadcaster id="args" value=""/>
   <grid>

editor/ui/dialogs/content/EdFieldSetProps.xul

@@ -49,9 +49,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdFieldSetProps.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdFieldSetProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdFormProps.xul

@@ -49,9 +49,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdFormProps.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdFormProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdHLineProps.xul

@@ -53,10 +53,10 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
-  <script type="application/x-javascript" src="chrome://editor/content/EdHLineProps.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdHLineProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   

editor/ui/dialogs/content/EdImageMap.xul

@@ -54,12 +54,12 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js" />
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
 
   <!-- Methods for Image Map only -->
-  <script type="application/x-javascript" src="chrome://editor/content/EdImageMap.js" />
-  <script type="application/x-javascript" src="chrome://editor/content/EdImageMapShapes.js" />
+  <script type="application/javascript" src="chrome://editor/content/EdImageMap.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdImageMapShapes.js"/>
 
   <broadcaster id="args" value=""/>
 

editor/ui/dialogs/content/EdImageMapHotSpot.xul

@@ -50,9 +50,9 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdImageMapHotSpot.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdImageMapHotSpot.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdImageOverlay.xul

@@ -43,7 +43,7 @@
 <overlay id="EdImageOverlay"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://editor/content/EdImageOverlay.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdImageOverlay.js"/>
 
   <tab id="imageInputTab" label="&imageInputTab.label;"/>
   <tab id="imageLocationTab" label="&imageLocationTab.label;"/>

editor/ui/dialogs/content/EdImageProps.xul

@@ -58,10 +58,10 @@
     ondialogaccept="return onAccept();"
     ondialogcancel="return onCancel();">
   
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdImageProps.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdInputImage.xul

@@ -50,9 +50,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdInputImage.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdInputImage.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdInputProps.xul

@@ -49,9 +49,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdInputProps.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdInputProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdInsSrc.xul

@@ -53,9 +53,9 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdInsSrc.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdInsertChars.xul

@@ -53,9 +53,9 @@
         ondialogcancel = "return onClose();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdInsertChars.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdInsertTOC.xul

@@ -55,11 +55,11 @@
     oncancel="window.close(); return true;">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
 
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdInsertTOC.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdInsertTOC.js"/>
+  <script type="application/javascript" src="chrome://global/content/dialogOverlay.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <spacer id="dummy" style="display:none"/>

editor/ui/dialogs/content/EdInsertTable.xul

@@ -51,9 +51,9 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdInsertTable.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdLabelProps.xul

@@ -49,9 +49,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdLabelProps.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdLabelProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdLinkChecker.xul

@@ -52,9 +52,9 @@
     ondialogcancel="return onCancelLinkChecker();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdLinkChecker.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdLinkChecker.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdLinkProps.xul

@@ -52,9 +52,9 @@
    ondialogaccept="return onAccept();"
    ondialogcancel="return onCancel();">
 
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdLinkProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdListProps.xul

@@ -52,9 +52,9 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdListProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdNamedAnchorProps.xul

@@ -51,9 +51,9 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdNamedAnchorProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 

editor/ui/dialogs/content/EdPageProps.xul

@@ -51,9 +51,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdPageProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdReplace.xul

@@ -52,9 +52,9 @@
    ondialogaccept="return onFindNext();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdReplace.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdReplace.js"/>
   <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
    
   <hbox>

editor/ui/dialogs/content/EdSelectProps.xul

@@ -49,9 +49,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdSelectProps.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdSelectProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EdSnapToGrid.xul

@@ -53,10 +53,10 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
-  <script type="application/x-javascript" src="chrome://editor/content/EdSnapToGrid.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdSnapToGrid.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 

editor/ui/dialogs/content/EdSpellCheck.xul

@@ -49,11 +49,11 @@
     ondialogaccept="return doDefault();"
     ondialogcancel="return CancelSpellCheck();">
 
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdSpellCheck.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdSpellCheck.js"/>
+  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
   <broadcaster id="args" value=""/>
 

editor/ui/dialogs/content/EdTableProps.xul

@@ -58,9 +58,9 @@
     ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdTableProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EdTextAreaProps.xul

@@ -49,9 +49,9 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdTextAreaProps.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdTextAreaProps.js"/>
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>

editor/ui/dialogs/content/EditConflict.xul

@@ -50,9 +50,9 @@
     ondialogcancel="return onClose();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EditConflict.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   

editor/ui/dialogs/content/EditorPublish.xul

@@ -55,10 +55,10 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EditorPublish.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/publishprefs.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EditorPublish.js"/>
+  <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EditorPublishProgress.xul

@@ -54,10 +54,10 @@
     ondialogcancel="return onClose();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/publishprefs.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EditorPublishProgress.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EditorPublishProgress.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EditorPublishSettings.xul

@@ -54,10 +54,10 @@
         ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/EditorPublishSettings.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/publishprefs.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/javascript" src="chrome://editor/content/EditorPublishSettings.js"/>
+  <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>

editor/ui/dialogs/content/EditorSaveAsCharset.xul

@@ -54,9 +54,9 @@
     style="width: 32em;">
 
     <!-- Methods common to all editor dialogs -->
-    <script type="application/x-javascript" src="chrome://editor/content/editorUtilities.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/javascript" src="chrome://editor/content/editorUtilities.js"/>
+    <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+    <script type="application/javascript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
     
     <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
     <broadcaster id="args" value=""/>