Fix bug 455768 - Convert calendar/ from application/x-javascript to application/javascript. r=philipp
authorStefan Sitter <ssitter@gmail.com>
Sun, 05 Oct 2008 18:18:22 +0200
changeset 521 144208ac1eee4a04e54c925c6e64ba00818867bd
parent 520 9f9d939509270979308d1a9d3f17440240b0230d
child 522 b7a5744f2be77e944e6892c4cd2f80c3a870c4b3
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs455768
Fix bug 455768 - Convert calendar/ from application/x-javascript to application/javascript. r=philipp
calendar/base/content/calErrorPrompt.xul
calendar/base/content/calendar-alarm-dialog.xul
calendar/base/content/calendar-alarm-snooze-popup.xul
calendar/base/content/calendar-common-sets.xul
calendar/base/content/calendar-occurrence-prompt.xul
calendar/base/content/calendar-properties-dialog.xul
calendar/base/content/calendar-publish-dialog.xul
calendar/base/content/calendar-scripts.inc
calendar/base/content/calendar-subscriptions-dialog.xul
calendar/base/content/calendar-summary-dialog.xul
calendar/base/content/calendar-task-view.xul
calendar/base/content/calendar-unifinder-todo.xul
calendar/base/content/calendar-unifinder.xul
calendar/base/content/chooseCalendarDialog.xul
calendar/base/content/migration.xul
calendar/base/content/preferences/advanced.xul
calendar/base/content/preferences/alarms.xul
calendar/base/content/preferences/categories.xul
calendar/base/content/preferences/connection.xul
calendar/base/content/preferences/editCategory.xul
calendar/base/content/preferences/general.xul
calendar/base/content/preferences/preferences.xul
calendar/base/content/preferences/timezones.xul
calendar/base/content/preferences/views.xul
calendar/base/content/today-pane.xul
calendar/lightning/content/customize-toolbar.xul
calendar/lightning/content/imip-bar-overlay.xul
calendar/lightning/content/lightning-calendar-creation.xul
calendar/lightning/content/lightning-calendar-properties.xul
calendar/lightning/content/lightning-migration.xul
calendar/lightning/content/lightning-scripts.inc
calendar/lightning/content/messenger-overlay-preferences.xul
calendar/lightning/content/messenger-overlay-toolbar.xul
calendar/prototypes/wcap/calendar-invitations-dialog.xul
calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xul
calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.xul
calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.xul
calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
calendar/prototypes/wcap/sun-calendar-event-dialog.xul
calendar/providers/gdata/content/gdata-migration-overlay.xul
calendar/providers/gdata/content/gdata-migration-wizard.xul
calendar/resources/content/calendarCreation.xul
calendar/resources/content/printDialog.xul
calendar/resources/content/publishDialog.xul
calendar/sunbird/base/content/aboutDialog.xul
calendar/sunbird/base/content/calendar-gotodate-dialog.xul
calendar/sunbird/base/content/calendar.xul
calendar/sunbird/base/content/credits.xhtml
calendar/sunbird/base/content/sunbird-scripts.inc
--- a/calendar/base/content/calErrorPrompt.xul
+++ b/calendar/base/content/calErrorPrompt.xul
@@ -47,17 +47,17 @@
         title="&calendar.error.title;"
         buttons="accept"
         onload="loadErrorPrompt()"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="500"
         xmlns:nc="http://home.netscape.com/NC-rdf#">
 
-    <script type="application/x-javascript"><![CDATA[
+    <script type="application/javascript"><![CDATA[
         function loadErrorPrompt() {
             var args = window.arguments[0].QueryInterface(Components.interfaces.nsIDialogParamBlock);
             document.getElementById("general-text").value = args.GetString(0);
             document.getElementById("error-number").value = args.GetString(1);
             document.getElementById("error-description").value = args.GetString(2);
             this.sizeToContent();
         }
         function toggleDetails() {
--- a/calendar/base/content/calendar-alarm-dialog.xul
+++ b/calendar/base/content/calendar-alarm-dialog.xul
@@ -57,18 +57,18 @@
         windowtype="calendarAlarmWindow"
         persist="screenX screenY width height"
         onload="setupWindow(); window.arguments[0].wrappedJSObject.window_onLoad();"
         onunload="finishWindow();"
         onfocus="onFocusWindow();"
         onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { window.close(); }"
         width="600"
         height="300">
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-alarm-dialog.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-alarm-dialog.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <richlistbox id="alarm-richlist" flex="1"/>
 
   <hbox pack="end" id="alarm-actionbar" align="center">
     <button id="alarm-snooze-all-button"
             oncommand="openSnoozeWindow(event, { snoozeAlarm: snoozeAllItems }); return false;">
       <label class="button-text" value="&calendar.alarm.snoozeallfor.label;"/>
       <dropmarker class="button-menu-dropmarker"/>
--- a/calendar/base/content/calendar-alarm-snooze-popup.xul
+++ b/calendar/base/content/calendar-alarm-snooze-popup.xul
@@ -48,19 +48,19 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         hidechrome="true"
         title="&calendar.alarm.snoozefor.label;"
         onkeydown="windowKeyDown(event)"
         onblur="windowBlur(event)"
         onmouseout="windowMouseOut(event)"
         onDOMContentLoaded="window.sizeToContent()"
         onload="windowLoad(event)">
-<script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/calendar-alarm-dialog.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/calendar-alarm-snooze-popup.js"/>
+<script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+<script type="application/javascript" src="chrome://calendar/content/calendar-alarm-dialog.js"/>
+<script type="application/javascript" src="chrome://calendar/content/calendar-alarm-snooze-popup.js"/>
 
 <radiogroup id="custom-menupopup-radiogroup"
             onblur="radiogroupBlur(event, this)"
             onmouseover="radiogroupMouseOver(event, this)">
   <radio label="&calendar.alarm.snooze.5minutes.label;"
          value="5"
          onclick="radioSnooze(event)"
          onkeypress="radioSnooze(event)"/>
--- a/calendar/base/content/calendar-common-sets.xul
+++ b/calendar/base/content/calendar-common-sets.xul
@@ -43,17 +43,17 @@
   <!ENTITY % menuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %menuOverlayDTD;
 ]>
 
 <overlay id="calendar-common-sets-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <stringbundleset id="calendar_stringbundles">
     <stringbundle id="bundle_branding" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-common-sets.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-common-sets.js"/>
 
   <broadcasterset id="calendar_broadcasters">
     <broadcaster id="modeBroadcaster" mode="calendar"/>
   </broadcasterset>
 
   <commandset id="calendar_commands"
               commandupdater="true"
               events="calendar_commands"
--- a/calendar/base/content/calendar-occurrence-prompt.xul
+++ b/calendar/base/content/calendar-occurrence-prompt.xul
@@ -43,18 +43,18 @@
 <dialog id="calendar-occurrence-prompt"
         buttons="cancel"
         ondialogcancel="return exitOccurrenceDialog(0)"
         onload="onLoad()"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
         xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
         xhtml2:role="wairole:alertdialog">
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-  <script type="application/x-javascript"><![CDATA[
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript"><![CDATA[
     function exitOccurrenceDialog(aReturnValue) {
       window.arguments[0].value = aReturnValue;
       window.close();
       return true;
     }
 
     function onLoad() {
       var action = window.arguments[0].action || "edit";
--- a/calendar/base/content/calendar-properties-dialog.xul
+++ b/calendar/base/content/calendar-properties-dialog.xul
@@ -51,18 +51,18 @@
     buttons="accept,cancel"
     ondialogaccept="return onAcceptDialog();"
     ondialogcancel="return true;"
     onload="onLoad()"
     persist="screenX screenY"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     width="500">
 
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-properties-dialog.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-properties-dialog.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <checkbox id="calendar-enabled-checkbox"
             label="&calendarproperties.enabled.label;"
             oncommand="setupEnabledCheckbox()"/>
 
   <grid id="calendar-properties-grid">
     <columns>
       <column/>
--- a/calendar/base/content/calendar-publish-dialog.xul
+++ b/calendar/base/content/calendar-publish-dialog.xul
@@ -56,20 +56,20 @@
   ondialogaccept="return onOKCommand();"
   ondialogcancel="return true;"
   onload="loadCalendarPublishDialog()"
   persist="screenX screenY"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:nc="http://home.netscape.com/NC-rdf#">
 
   <!-- Javascript includes -->
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-publish-dialog.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-publish-dialog.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   var closeButtonLabel = "&calendar.publish.close.button;";
   </script>
 
   <!-- Data used in JS from dtd -->
   <keyset id="dialogKeys"/>
 
   <!-- The dialog -->
 
--- a/calendar/base/content/calendar-scripts.inc
+++ b/calendar/base/content/calendar-scripts.inc
@@ -38,35 +38,35 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the LGPL or the GPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
   <!-- NEEDED FOR MULTIPLE CALENDAR SUPPORT -->
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-management.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-management.js"/>
 
   <!-- NEEDED FOR CLIPBOARD SUPPORT -->
-  <script type="application/x-javascript" src="chrome://calendar/content/clipboard.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/clipboard.js"/>
 
   <!-- NEEDED FOR IMPORT / EXPORT SUPPORT -->
-  <script type="application/x-javascript" src="chrome://calendar/content/import-export.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/import-export.js"/>
 
   <!-- NEEDED FOR PUBLICATION SUPPORT -->
-  <script type="application/x-javascript" src="chrome://calendar/content/publish.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/publish.js"/>
 
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-chrome-startup.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/mouseoverPreviews.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-views.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-creation.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-chrome-startup.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/mouseoverPreviews.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-views.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-creation.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <!-- NEEDED FOR MINIMONTH BUSY HIGHLIGHT -->
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-minimonth-busy.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-minimonth-busy.js"/>
 
   <!-- NEEDED FOR TASK VIEW/LIST SUPPORT -->
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-task-editing.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-task-editing.js"/>
--- a/calendar/base/content/calendar-subscriptions-dialog.xul
+++ b/calendar/base/content/calendar-subscriptions-dialog.xul
@@ -54,19 +54,19 @@
   ondialogcancel="return onCancel();"
   onload="return onLoad();"
   onunload="return onUnload();"
   onkeypress="onKeyPress(event);" 
   persist="screenX screenY width height"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-subscriptions-dialog.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-subscriptions-dialog.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
 
   <vbox flex="1">
     <grid flex="1">
       <columns>
         <column flex="1"/>
         <column/>
       </columns>
       <rows>  
--- a/calendar/base/content/calendar-summary-dialog.xul
+++ b/calendar/base/content/calendar-summary-dialog.xul
@@ -60,27 +60,27 @@
 <dialog id="calendar-summary-dialog"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://calendar/content/calendar-summary-dialog.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://calendar/content/calUtils.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://calendar/content/calendar-item-editing.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://calendar/content/calApplicationUtils.js"/>
 
   <!-- General -->
   <box id="item-general-box" orient="vertical">
     <calendar-caption label="&read.only.general.label;"/>
     <box orient="horizontal">
       <spacer class="default-spacer"/>
       <grid flex="1">
--- a/calendar/base/content/calendar-task-view.xul
+++ b/calendar/base/content/calendar-task-view.xul
@@ -42,21 +42,21 @@
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-bindings.css"?>
 
 <!DOCTYPE overlay [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" > %dtd2;
 ]>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-task-tree.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-task-view.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calApplicationUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-task-tree.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-task-view.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calApplicationUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <vbox id="displayDeck">
     <vbox id="calendar-task-box" flex="1"
           onselect="taskDetailsView.onSelect(event);">
       <textbox id="view-task-edit-field"
                class="task-edit-field"
                onfocus="taskEdit.onFocus(event)"
                onblur="taskEdit.onBlur(event)"
--- a/calendar/base/content/calendar-unifinder-todo.xul
+++ b/calendar/base/content/calendar-unifinder-todo.xul
@@ -45,19 +45,19 @@
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd3;
 ]>
 
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-bindings.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-task-tree.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-unifinder-todo.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-task-tree.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-unifinder-todo.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   
   <vbox id="todo-tab-panel" persist="height,collapsed" flex="1">
     <box id="todo-label" align="left" collapsed="true">
       <label flex="1" crop="end" style="font-weight: bold" value="&calendar.unifinder.todoitems.label;" control="unifinder-todo-tree"/>
     </box>
     <box align="center">
       <checkbox id="show-completed-checkbox"
                 label="&calendar.unifinder.showcompletedtodos.label;"
--- a/calendar/base/content/calendar-unifinder.xul
+++ b/calendar/base/content/calendar-unifinder.xul
@@ -48,18 +48,18 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css" ?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-unifinder.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://calendar/locale/calendar.dtd">
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-unifinder.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-unifinder.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <vbox id="calendar-view-box">
     <vbox id="bottom-events-box" insertbefore="view-deck" persist="height">
       <hbox id="unifinder-searchBox" persist="collapsed">
         <box align="center">
           <menulist id="event-filter-menulist" value="next7Days" persist="value">
             <menupopup id="event-filter-menupopup" oncommand="refreshEventTree()">
               <menuitem id="event-filter-all"
--- a/calendar/base/content/chooseCalendarDialog.xul
+++ b/calendar/base/content/chooseCalendarDialog.xul
@@ -48,17 +48,17 @@
 <dialog id="chooseCalendar"
         title="&calendar.select.dialog.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         buttons="accept,cancel"
         onload="loadCalendars();"
         ondialogaccept="return doOK();"
         persist="screenX screenY height width">
 
-    <script type="application/x-javascript"><![CDATA[
+    <script type="application/javascript"><![CDATA[
         function loadCalendars() {
             const calendarManager = Components.classes["@mozilla.org/calendar/manager;1"]
                                             .getService(Components.interfaces.calICalendarManager);
             var listbox = document.getElementById("calendar-list");
             var composite = window.opener.getCompositeCalendar();
             var selectedIndex = 0;
             var calendars;
 
--- a/calendar/base/content/migration.xul
+++ b/calendar/base/content/migration.xul
@@ -49,19 +49,19 @@
 <wizard id="migration-wizard"
         title="&migration.title;"
         windowtype="Calendar:MigrationWizard"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="gMigrateWizard.loadMigrators()"
         branded="true"
         persist="screenX screenY">
 
-    <script type="application/x-javascript" src="chrome://calendar/content/migration.js"/>
-    <script type="application/x-javascript" src="chrome://calendar/content/import-export.js"/>
-    <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+    <script type="application/javascript" src="chrome://calendar/content/migration.js"/>
+    <script type="application/javascript" src="chrome://calendar/content/import-export.js"/>
+    <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
     <wizardpage id="wizardPage1"
                 pageid="initialPage"
                 next="progressPage"
                 label="&migration.welcome;">
         <label id="wizard-desc" control="datasource-list">&migration.list.description;</label>
         <listbox id="datasource-list" flex="1">
         </listbox>
--- a/calendar/base/content/preferences/advanced.xul
+++ b/calendar/base/content/preferences/advanced.xul
@@ -45,17 +45,17 @@
     %brandDTD;
     %advancedDTD;
 ]>
 
 <overlay id="AdvancedPaneOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="calPreferencesBoxAdvanced">
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/preferences/advanced.js"/>
 
         <preferences id="advancePrefs-preferences">
             <preference id="calendar.preferences.advanced.selectedTabIndex"
                         name="calendar.preferences.advanced.selectedTabIndex"
                         type="int"/>
 
             <!-- Passwords tab -->
--- a/calendar/base/content/preferences/alarms.xul
+++ b/calendar/base/content/preferences/alarms.xul
@@ -47,19 +47,19 @@
 ]>
 
 <overlay id="AlarmsPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="calPreferencesBoxAlarms">
         <stringbundle id="bundleCalendarPreferences"
                       src="chrome://calendar/locale/calendar.properties"/>
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/preferences/alarms.js"/>
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/calendar-dialog-utils.js"/>
 
         <preferences>
             <preference id="calendar.alarms.playsound"
                         name="calendar.alarms.playsound"
                         type="bool"
                         onchange="gAlarmsPane.alarmsPlaySoundPrefChanged();"/>
             <preference id="calendar.alarms.soundURL"
--- a/calendar/base/content/preferences/categories.xul
+++ b/calendar/base/content/preferences/categories.xul
@@ -39,21 +39,21 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://calendar/locale/preferences/categories.dtd">
 
 <overlay id="CategoriesPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="calPreferencesBoxCategories">
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/preferences/categories.js"/>
 
         <!-- Get the localized text for use in the .js -->
-        <script type="application/x-javascript">
+        <script type="application/javascript">
             var noneLabel  = "&pref.categories.none.label;";
             var addTitle   = "&pref.categories.add.title;";
             var editTitle  = "&pref.categories.edit.title;";
             var overwrite  = "&pref.categories.overwrite;";
             var overwriteTitle = "&pref.categories.overwrite.title;";
             var noBlankCategories = "&pref.categories.noBlankCategories;";
         </script>
         
--- a/calendar/base/content/preferences/connection.xul
+++ b/calendar/base/content/preferences/connection.xul
@@ -81,17 +81,17 @@
       <preference id="network.proxy.backup.ssl"          name="network.proxy.backup.ssl"          type="string"/>
       <preference id="network.proxy.backup.ssl_port"     name="network.proxy.backup.ssl_port"     type="int"/>
       <preference id="network.proxy.backup.socks"        name="network.proxy.backup.socks"        type="string"/>
       <preference id="network.proxy.backup.socks_port"   name="network.proxy.backup.socks_port"   type="int"/>
       <preference id="network.proxy.backup.gopher"       name="network.proxy.backup.gopher"       type="string"/>
       <preference id="network.proxy.backup.gopher_port"  name="network.proxy.backup.gopher_port"  type="int"/>
     </preferences>
     
-    <script type="application/x-javascript" src="chrome://calendar/content/preferences/connection.js"/>
+    <script type="application/javascript" src="chrome://calendar/content/preferences/connection.js"/>
 
     <stringbundle id="preferencesBundle" src="chrome://calendar/locale/preferences/preferences.properties"/>
 
     <groupbox>
       <caption label="&proxyTitle.label;"/>
 
       <radiogroup id="networkProxyType" preference="network.proxy.type"
                   onsyncfrompreference="return gConnectionsDialog.readProxyType();">
--- a/calendar/base/content/preferences/editCategory.xul
+++ b/calendar/base/content/preferences/editCategory.xul
@@ -46,17 +46,17 @@
 ]>
 
 <dialog id="editCategory"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         buttons="accept,cancel"
         onload="editCategoryLoad();"
         ondialogaccept="return doOK();">
 
-<script type="application/x-javascript">
+<script type="application/javascript">
  <![CDATA[
    var oldColor="#000000";
    function editCategoryLoad()
    {
      document.getElementById("categoryName").value = window.arguments[0];
      document.getElementById("categoryColor").color = window.arguments[1];
      document.title = window.arguments[2];
      if(window.arguments[1])
--- a/calendar/base/content/preferences/general.xul
+++ b/calendar/base/content/preferences/general.xul
@@ -44,23 +44,23 @@
     %generalDTD;
     %globalDTD;
 ]>
 
 <overlay id="CalendarGeneralPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="calPreferencesBoxGeneral">
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/preferences/general.js"/>
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/calendar-ui-utils.js"/>
 
         <!-- Get the localized text for use in the .js -->
-        <script type="application/x-javascript">
+        <script type="application/javascript">
             var labelLong  = "&pref.dateformat.long;";
             var labelShort = "&pref.dateformat.short;";
         </script>
 
         <preferences>
             <preference id="calendar.date.format"
                         name="calendar.date.format"
                         type="int"/>
--- a/calendar/base/content/preferences/preferences.xul
+++ b/calendar/base/content/preferences/preferences.xul
@@ -110,12 +110,12 @@
 
     <prefpane id="paneAdvanced"
               label="&paneAdvanced.title;"
               onpaneload="gAdvancedPane.init();"
               src="chrome://calendar/content/preferences/advanced.xul">
         <vbox id="calPreferencesBoxAdvanced"/>
     </prefpane>
 
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/calUtils.js"/>
 
 </prefwindow>
--- a/calendar/base/content/preferences/timezones.xul
+++ b/calendar/base/content/preferences/timezones.xul
@@ -40,21 +40,21 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://calendar/locale/preferences/timezones.dtd">
 
 <overlay id="TimezonesPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="calPreferencesBoxTimezones">
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/preferences/timezones.js"/>
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/calendar-ui-utils.js"/>
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/calUtils.js"/>
 
         <preferences>
             <preference id="calendar-timezone-local"
                         name="calendar.timezone.local"
                         type="string"/>
         </preferences>
 
--- a/calendar/base/content/preferences/views.xul
+++ b/calendar/base/content/preferences/views.xul
@@ -47,19 +47,19 @@
     %viewsDTD;
     %globalDTD;
 ]>
 
 <overlay id="ViewsPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="calPreferencesBoxViews">
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/preferences/views.js"/>
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/calendar-ui-utils.js"/>
 
         <preferences>
             <preference id="calendar.week.start"
                         name="calendar.week.start"
                         type="int"/>
             <preference id="calendar.week.d0sundaysoff"
                         name="calendar.week.d0sundaysoff"
--- a/calendar/base/content/today-pane.xul
+++ b/calendar/base/content/today-pane.xul
@@ -49,21 +49,21 @@
 
 <?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/minimonth.css" type="text/css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/x-javascript" src="chrome://calendar/content/today-pane.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/agenda-listbox.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/calendar-management.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
+<script type="application/javascript" src="chrome://calendar/content/today-pane.js"/>
+<script type="application/javascript" src="chrome://calendar/content/agenda-listbox.js"/>
+<script type="application/javascript" src="chrome://calendar/content/calendar-management.js"/>
+<script type="application/javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
+<script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
 
     <modevbox id="today-pane-panel" addtoolbarbutton="true" width="200"
               mode="mail,calendar,task" refcontrol="calendar_toggle_todaypane_command"
               broadcaster="modeBroadcaster" persist="addtoolbarbutton width">
       <sidebarheader align="center">
         <label id ="today-pane-header"/>
         <spacer flex="1"/>
         <modehbox mode="mail,calendar" broadcaster="modeBroadcaster">
--- a/calendar/lightning/content/customize-toolbar.xul
+++ b/calendar/lightning/content/customize-toolbar.xul
@@ -46,17 +46,17 @@
   <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
   %lightningDTD;
 ]>
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://lightning/content/customize-toolbar.js"/>
 
   <vbox id="main-box" flex="1" collapsed="true">
     <box id="selector-container" orient="vertical" insertbefore="instructions" collapsed="true">
       <box align="center" orient="horizontal">
         <label value="&customize.toolbar.selector.label;" control="selector-list"/>
         <menulist id="selector-list"
                   value="mode"
--- a/calendar/lightning/content/imip-bar-overlay.xul
+++ b/calendar/lightning/content/imip-bar-overlay.xul
@@ -46,25 +46,25 @@
 <?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 <?xml-stylesheet href="chrome://lightning/content/lightning-widgets.css" type="text/css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://lightning/content/lightning-utils.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/calUtils.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://lightning/content/imip-bar.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/calendar-management.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/calendar-ui-utils.js"/>
 
     <vbox id="messagepanebox">
         <lightning-notification-bar id="imip-bar"
                                     collapsed="true"
                                     insertbefore="msgHeaderView"
                                     label="&lightning.imipbar.description;">
           <button id="imip-button1" hidden="true"/>
--- a/calendar/lightning/content/lightning-calendar-creation.xul
+++ b/calendar/lightning/content/lightning-calendar-creation.xul
@@ -38,21 +38,21 @@
    - ***** END LICENSE BLOCK *****
 -->
 
 <!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd">
 
 <overlay id="ltnCalendarCreationOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://lightning/content/lightning-utils.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://lightning/content/lightning-calendar-creation.js"/>
 
   <rows id="customize-rows">
     <row id="calendar-email-identity-row"
          align="center"
          insertafter="customize-suppressAlarms-row">
       <label value="&lightning.calendarproperties.email.label;"
              control="email-identity-menulist"/>
--- a/calendar/lightning/content/lightning-calendar-properties.xul
+++ b/calendar/lightning/content/lightning-calendar-properties.xul
@@ -38,21 +38,21 @@
    - ***** END LICENSE BLOCK *****
 -->
 
 <!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd">
 
 <overlay id="ltnCalendarPropertiesOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://lightning/content/lightning-utils.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://lightning/content/lightning-calendar-properties.js"/>
 
   <rows id="calendar-properties-rows">
     <row id="calendar-email-identity-row"
          align="center"
          insertafter="calendar-uri-row">
       <label value="&lightning.calendarproperties.email.label;"
              control="email-identity-menulist"
--- a/calendar/lightning/content/lightning-migration.xul
+++ b/calendar/lightning/content/lightning-migration.xul
@@ -49,18 +49,18 @@
 
 <!-- DTD File with all strings specific to the file -->
 <!DOCTYPE overlay
 [
 ]>
 
 <overlay id="ltnMigrationOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <script type="application/x-javascript" src="chrome://calendar/content/migration.js"/>
-    <script type="application/x-javascript"><![CDATA[
+    <script type="application/javascript" src="chrome://calendar/content/migration.js"/>
+    <script type="application/javascript"><![CDATA[
         function checkOld() {
             document.removeEventListener("load", checkOld, true);
             var calMgr = Components.classes["@mozilla.org/calendar/manager;1"]
                                    .getService(Components.interfaces.calICalendarManager);
             var cals = calMgr.getCalendars({});
             if (!cals.length) {
                 // There are no calendars, so we are running for the first time
                 gDataMigrator.checkAndMigrate();
--- a/calendar/lightning/content/lightning-scripts.inc
+++ b/calendar/lightning/content/lightning-scripts.inc
@@ -37,23 +37,23 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK ***** -->
 
-<script type="application/x-javascript" src="chrome://lightning/content/lightning-utils.js"/>
-<script type="application/x-javascript" src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
-<script type="application/x-javascript" src="chrome://lightning/content/messenger-overlay-toolbar.js"/>
-<script type="application/x-javascript" src="chrome://lightning/content/lightning-common-sets.js"/>
-<script type="application/x-javascript" src="chrome://lightning/content/lightning-today-pane.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/calendar-invitations-manager.js"/>
-<script type="application/x-javascript">
+<script type="application/javascript" src="chrome://lightning/content/lightning-utils.js"/>
+<script type="application/javascript" src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
+<script type="application/javascript" src="chrome://lightning/content/messenger-overlay-toolbar.js"/>
+<script type="application/javascript" src="chrome://lightning/content/lightning-common-sets.js"/>
+<script type="application/javascript" src="chrome://lightning/content/lightning-today-pane.js"/>
+<script type="application/javascript" src="chrome://calendar/content/calendar-invitations-manager.js"/>
+<script type="application/javascript">
     var calendarmenulabel = "&lightning.calendar.label;";
     var calendarmenuaccesskey = "&lightning.calendar.accesskey;";
     var messagemenulabel = "&msgMenu.label;";
     var messagemenuaccesskey = "&msgMenu.accesskey;";
     var tasksmenulabel = "&lightning.tasks.label;";
     var tasksmenuaccesskey = "&lightning.tasks.accesskey;";
     var invitationsLabel = "&lightning.sidebar.invitations.label;";
 </script>
--- a/calendar/lightning/content/messenger-overlay-preferences.xul
+++ b/calendar/lightning/content/messenger-overlay-preferences.xul
@@ -90,16 +90,16 @@
                     </tabpanel>
                     <tabpanel orient="vertical">
                         <vbox id="calPreferencesBoxTimezones"/>
                     </tabpanel>
                 </tabpanels>
             </tabbox>
         </prefpane>
 
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://calendar/content/calUtils.js"/>
-        <script type="application/x-javascript"
+        <script type="application/javascript"
                 src="chrome://lightning/content/messenger-overlay-preferences.js"/>
 
     </prefwindow>
 
 </overlay>
--- a/calendar/lightning/content/messenger-overlay-toolbar.xul
+++ b/calendar/lightning/content/messenger-overlay-toolbar.xul
@@ -48,17 +48,17 @@
   %calendarDTD;
 ]>
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-toolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://lightning/content/messenger-overlay-toolbar.js"/>
 
   <popup id="toolbar-context-menu">
     <menuitem id="CustomizeMailToolbar"
               label="&customizeToolbar.label;"
               accesskey="&customizeToolbar.accesskey;"
               oncommand="CustomizeApplicationToolbar('mail-toolbox');"/>
   </popup>
--- a/calendar/prototypes/wcap/calendar-invitations-dialog.xul
+++ b/calendar/prototypes/wcap/calendar-invitations-dialog.xul
@@ -50,22 +50,22 @@
   ondialogaccept="return onAccept();"
   ondialogcancel="return onCancel();"
   onload="return onLoad();"
   onunload="return onUnload();"
   persist="screenX screenY width height"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-invitations-dialog.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-invitations-dialog.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
 
-  <script type="application/x-javascript" >
+  <script type="application/javascript" >
     var invitationsText = "&calendar.invitations.dialog.invitations.text;";
   </script>
 
   <vbox id="dialog-box" flex="1">
     <stack flex="1">
       <calendar-invitations-richlistbox id="invitations-listbox" flex="1"/>
       <hbox id="updating-box" align="center" pack="center" hidden="true">
         <label value="&calendar.invitations.dialog.statusmessage.updating.text;"
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xul
+++ b/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xul
@@ -51,19 +51,19 @@
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
         persist="screenX screenY"
         style="padding-top: 8px; padding-bottom: 10px; -moz-padding-start: 8px; -moz-padding-end: 10px;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/x-javascript" src="chrome://calendar/content/sun-calendar-event-dialog-attendees.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/sun-calendar-event-dialog-attendees.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <box orient="vertical" flex="1">
     <box orient="horizontal" align="center" pack="end">
       <spacer flex="1"/>
       <label value="&event.freebusy.suggest.slot;"/>
       <button label="&event.freebusy.previous.slot;"
               dir="normal"
               class="left-icon"
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.xul
+++ b/calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.xul
@@ -53,20 +53,20 @@
         title="&recurrence.title.label;"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return true;"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/x-javascript" src="chrome://calendar/content/sun-calendar-event-dialog-recurrence.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/sun-calendar-event-dialog-recurrence.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <!-- recurrence pattern -->
   <groupbox id="recurrence-pattern-groupbox">
     <caption id="recurrence-pattern-caption"
              label="&event.recurrence.pattern.label;"/>
     <grid id="recurrence-pattern-grid">
       <columns id="recurrence-pattern-columns">
         <column id="recurrence-pattern-description-column"/>
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.xul
+++ b/calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.xul
@@ -50,19 +50,19 @@
         title="&reminder.title.label;"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/x-javascript" src="chrome://calendar/content/sun-calendar-event-dialog-reminder.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/sun-calendar-event-dialog-reminder.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <!-- Listbox with custom reminders -->
   <grid flex="1">
     <rows>
       <row/>
       <row/>
       <row flex="1"/>
       <row/>
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
+++ b/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
@@ -52,20 +52,20 @@
         title="&timezone.title.label;"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/x-javascript" src="chrome://calendar/content/sun-calendar-event-dialog-timezone.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/sun-calendar-event-dialog-timezone.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <hbox align="center">
     <spacer flex="1"/>
     <datetimepicker id="timezone-time" disabled="true"/>
   </hbox>
 
   <menulist id="timezone-menulist" oncommand="updateTimezone()">
     <menupopup id="timezone-menupopup" style="height: 460px;"/>
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog.xul
+++ b/calendar/prototypes/wcap/sun-calendar-event-dialog.xul
@@ -65,29 +65,29 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <stringbundleset id="stringbundleset">
       <stringbundle id="languageBundle"
                     src="chrome://global/locale/languageNames.properties"/>
     </stringbundleset>
 
     <!-- Javascript includes -->
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/sun-calendar-event-dialog.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/calendar-dialog-utils.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/calendar-ui-utils.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/calUtils.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://calendar/content/calApplicationUtils.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://global/content/globalOverlay.js"/>
-    <script type="application/x-javascript"
+    <script type="application/javascript"
             src="chrome://global/content/printUtils.js"/>
 
     <!-- Command updater -->
     <commandset id="globalEditMenuItems"
                 commandupdater="true"
                 events="focus"
                 oncommandupdate="goUpdateGlobalEditMenuItems()"/>
     <commandset id="selectEditMenuItems"
--- a/calendar/providers/gdata/content/gdata-migration-overlay.xul
+++ b/calendar/providers/gdata/content/gdata-migration-overlay.xul
@@ -32,10 +32,10 @@
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <overlay id="gdata-migration-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://gdata-provider/content/gdata-migration.js"/>
+  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-migration.js"/>
 </overlay>
--- a/calendar/providers/gdata/content/gdata-migration-wizard.xul
+++ b/calendar/providers/gdata/content/gdata-migration-wizard.xul
@@ -45,16 +45,16 @@
         acceptLabel="&gdata.migration.upgrade.label;"
         acceptKey="&gdata.migration.upgrade.accesskey;"
         ondialogaccept="migrateSelectedCalendars(); return true;"
         ondialogcancel="window.close()"
         onload="gdata_migration_loader()"
         width="300"
         height="300"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://gdata-provider/content/gdata-migration.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-views.js"/>
+  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-migration.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-views.js"/>
 
   <description>&gdata.migration.description;</description>
   <listbox id="calendars-listbox" flex="1"/>
   <checkbox id="showagain-checkbox" label="&gdata.migration.showagain.label;"/>
 </dialog>
--- a/calendar/resources/content/calendarCreation.xul
+++ b/calendar/resources/content/calendarCreation.xul
@@ -51,18 +51,18 @@
 <!-- The Window  -->
 
 <wizard id="calendar-wizard"
         title="&wizard.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onwizardfinish=""
         persist="screenX screenY">
 
-   <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-   <script type="application/x-javascript" src="chrome://calendar/content/calendarCreation.js"/>
+   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+   <script type="application/javascript" src="chrome://calendar/content/calendarCreation.js"/>
 
    <wizardpage pageid="initialPage" 
                next="locationPage"
                label="&wizard.label;"
                description="&wizard.description;"
                onpageshow="checkRequired();"
                onpageadvanced="onInitialAdvance();">
         <description>&initialpage.description;</description>
--- a/calendar/resources/content/printDialog.xul
+++ b/calendar/resources/content/printDialog.xul
@@ -68,19 +68,19 @@
    buttonaccesskeyaccept="&calendar.print.accesskey;"
    defaultButton="accept"
    ondialogaccept="return printAndClose();"
    ondialogcancel="return true;"
    persist="screenX screenY width height"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:nc="http://home.netscape.com/NC-rdf#">
 
-  <script type="application/x-javascript" src="chrome://calendar/content/printDialog.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/printDialog.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
 
   <hbox id="firstHbox" flex="1">
     <vbox id="groupboxVbox">
 
       <groupbox id="settingsGroup">
         <caption label="&calendar.print.settingsGroup.label;"/>
 
         <grid>
--- a/calendar/resources/content/publishDialog.xul
+++ b/calendar/resources/content/publishDialog.xul
@@ -59,20 +59,20 @@
    onload="loadCalendarPublishDialog()"
    persist="screenX screenY"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:nc="http://home.netscape.com/NC-rdf#">
     
    
    <!-- Javascript includes -->
    
-   <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
-   <script type="application/x-javascript" src="chrome://calendar/content/publishDialog.js"/>
+   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+   <script type="application/javascript" src="chrome://calendar/content/publishDialog.js"/>
    
-   <script type="application/x-javascript" >
+   <script type="application/javascript" >
    var publishButtonLabel = "&calendar.publish.publish.button;" ;
    var closeButtonLabel = "&calendar.publish.close.button;" ;
    </script>
 
    <!-- Data used in JS from dtd -->
    
    <keyset id="dialogKeys"/>
 
--- a/calendar/sunbird/base/content/aboutDialog.xul
+++ b/calendar/sunbird/base/content/aboutDialog.xul
@@ -61,17 +61,17 @@
         buttons="accept,extra2"
 #endif
         creditslabel="&copyright.label;"
         creditsaccesskey="&copyright.accesskey;"
         aboutlabel="&aboutLink.label;"
         aboutaccesskey="&aboutLink.accesskey;"
         style="width: 299px;height: 435px;">
 
-  <script type="application/x-javascript" src="chrome://calendar/content/aboutDialog.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/aboutDialog.js"/>
 
   <deck id="modes" flex="1">
     <vbox flex="1" id="clientBox">
 #expand <label id="version" value="&aboutVersion; __APP_VERSION__"/>
       <description id="copyright">&copyrightText;</description>
       <vbox id="detailsBox" align="center" flex="1">
         <spacer flex="1"/>
         <textbox flex="1" id="userAgent" multiline="true" readonly="true" cols="60"/>
--- a/calendar/sunbird/base/content/calendar-gotodate-dialog.xul
+++ b/calendar/sunbird/base/content/calendar-gotodate-dialog.xul
@@ -52,14 +52,14 @@
      * date (optional) - initially selected date in datepicker -->
 <dialog id="calendar-gotodate-dialog"
         title="&calendar.flat.topbar.choosedate;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="document.getElementById('datepicker').value = window.arguments[0].date || new Date();"
         buttons="accept,cancel"
         ondialogaccept="window.arguments[0].callback(document.getElementById('datepicker').value);"
         ondialogcancel="return true;">
-  <script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
   <hbox align="center">
     <label control="datepicker">&calendar.flat.topbar.choosedate;</label>
     <datepicker id="datepicker"/>
   </hbox>
 </dialog>
--- a/calendar/sunbird/base/content/calendar.xul
+++ b/calendar/sunbird/base/content/calendar.xul
@@ -90,18 +90,18 @@
      file (all scripts shared with Lightning) or sunbird-scripts.inc file (scripts relevant 
      for Sunbird-only)so that they can be shared by hiddenWindow.xul.-->
 #include ../../../base/content/calendar-scripts.inc
 #include sunbird-scripts.inc
 
 <!-- Those scripts are not used by the hidden window, and thus can be put in here. The
      scripts assume that they are part of calendar.xul, so they actually must not be
      in sunbird-scripts.inc. (see bug 413296 comment 13) -->
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-unifinder.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-unifinder-todo.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-unifinder.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-unifinder-todo.js"/>
 
 <!-- GENERAL CONTEXT MENU -->
 <popupset id="calendar-popupset">
   <popup id="toolbar-context-menu">
     <menuitem command="cmd_CustomizeToolbars"
               id="toolbar-context-menu-customize"
               label="&calendar.context.customize.label;"
               accesskey="&calendar.context.customize.accesskey;"/>
--- a/calendar/sunbird/base/content/credits.xhtml
+++ b/calendar/sunbird/base/content/credits.xhtml
@@ -148,18 +148,18 @@
         list-style-type: none;
       }
 
       .center {
         text-align: center;
       }
     </style>
 
-    <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
-    <script type="application/x-javascript">
+    <script type="application/javascript" src="chrome://global/content/globalOverlay.js"></script>
+    <script type="application/javascript">
     <![CDATA[
 
       var gCreditsInterval = -1;
 
       function uninit()
       {
         if (gCreditsInterval > -1)
           clearInterval(gCreditsInterval);
--- a/calendar/sunbird/base/content/sunbird-scripts.inc
+++ b/calendar/sunbird/base/content/sunbird-scripts.inc
@@ -36,30 +36,30 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the LGPL or the GPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-<script type="application/x-javascript">
+<script type="application/javascript">
   var confirmDeleteAllEvents = "&calendar.confirm.deleteallevents;";
   var confirmDeleteEvent = "&calendar.confirm.deleteevent;";
   var confirmDeleteUntitledEvent = "&calendar.confirm.deleteuntitledevent;";
   var defaultCalendarFileName = "&calendar.file.default.name;";
 </script>
 
 #ifdef XP_MACOSX
   <!-- Needed for Mac OS X "Window" menu -->
-  <script type="application/x-javascript" src="chrome://calendar/content/hiddenWindow.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/hiddenWindow.js"/>
 #endif
 
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendarWindow.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calendar-offline.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/migration.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendarWindow.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-offline.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/migration.js"/>
 
   <!-- NEEDED FOR APPLICATION SUPPORT -->
-  <script type="application/x-javascript" src="chrome://calendar/content/applicationUtil.js"/>
-  <script type="application/x-javascript" src="chrome://calendar/content/calApplicationUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/applicationUtil.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calApplicationUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>