Bug 455222 XUL <script> needs a type to access latest JS language extensions r=IanN r=mkmelin b=KaiRo
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Wed, 17 Sep 2008 13:52:38 +0100
changeset 354 c1f31d315bfaa0e6240447cf7f93474b30dd695e
parent 353 5e42e6537169dd3154c7a0f47bcbfde4314a51af
child 355 e8ba2f193d98d4ee8d39c37372c458db99202f97
push idunknown
push userunknown
push dateunknown
reviewersIanN, mkmelin
bugs455222
Bug 455222 XUL <script> needs a type to access latest JS language extensions r=IanN r=mkmelin b=KaiRo
mailnews/base/prefs/resources/content/smtpEditOverlay.xul
mailnews/base/resources/content/msgHdrViewOverlay.xul
mailnews/base/resources/content/msgPrintEngine.xul
mailnews/base/resources/content/threadPane.xul
mailnews/base/search/resources/content/ABSearchDialog.xul
mailnews/base/search/resources/content/SearchDialog.xul
mailnews/base/search/resources/content/searchTermOverlay.xul
mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.xul
suite/common/permissions/cookieViewer.xul
--- a/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
+++ b/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
@@ -38,17 +38,17 @@
 
  ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/smtpEditOverlay.dtd">
 
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script src="smtpEditOverlay.js"/>
+  <script type="application/javascript" src="smtpEditOverlay.js"/>
 
   <vbox id="smtpServerEditor">
       <groupbox>
           <caption label="&settings.caption;"/>
           <grid flex="1">
               <columns>
                   <column/>
                   <column flex="1"/>
--- a/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -44,20 +44,22 @@
 ]>
 
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageKeywords.css" type="text/css"?>
 
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script src="chrome://messenger/content/msgHdrViewOverlay.js"/>
+<script type="application/javascript"
+        src="chrome://messenger/content/msgHdrViewOverlay.js"/>
 
 <!-- drag and drop -->
-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript"
+        src="chrome://global/content/nsDragAndDrop.js"/>
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 </stringbundleset>
 
 <popup id="messageIdContext" popupanchor="bottomleft"
        onpopupshowing="FillMessageIdContextMenu(document.popupNode);">
   <menuitem id="messageIdContext-messageIdTarget"
--- a/mailnews/base/resources/content/msgPrintEngine.xul
+++ b/mailnews/base/resources/content/msgPrintEngine.xul
@@ -51,14 +51,16 @@
         persist="width height screenX screenY sizemode"
         windowtype="mail:printEngine">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
 
-  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-  <script src="chrome://messenger/content/msgPrintEngine.js"/>
+  <script type="application/javascript"
+          src="chrome://global/content/printUtils.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/msgPrintEngine.js"/>
 
   <!-- The main display frame -->
   <browser id="content" type="content-primary" name="content" src="about:blank" flex="1" disablehistory="true" disablesecurity="true"/>
 </window>
--- a/mailnews/base/resources/content/threadPane.xul
+++ b/mailnews/base/resources/content/threadPane.xul
@@ -42,17 +42,18 @@
 <?xml-stylesheet href="chrome://messenger/skin/threadPaneExtras.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/threadPaneLabels.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/threadpane.dtd">
 
 <overlay
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script src="chrome://messenger/content/threadPane.js"/>
+<script type="application/javascript"
+        src="chrome://messenger/content/threadPane.js"/>
 
 <tree id="threadTree" persist="width lastfoldersent" flex="1" enableColumnDrag="true" _selectDelay="500"
     class="plain focusring" disableKeyNavigation="true" lastfoldersent="false" noattachcol="true"
     onkeypress="ThreadPaneKeyPress(event);"
     onselect="ThreadPaneSelectionChanged();">
   <treecols id="threadCols" pickertooltiptext="&columnChooser.tooltip;">
     <treecol id="threadCol" persist="hidden ordinal" fixed="true" cycler="true" class="treecol-image threadColumnHeader" currentView="unthreaded"
              label="&threadColumn.label;" tooltiptext="&threadColumn.tooltip;"/>
--- a/mailnews/base/search/resources/content/ABSearchDialog.xul
+++ b/mailnews/base/search/resources/content/ABSearchDialog.xul
@@ -61,22 +61,28 @@
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
-  <script src="chrome://messenger/content/mailWindow.js"/>
-  <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-  <script src="chrome://global/content/globalOverlay.js"/>
-  <script src="chrome://messenger/content/commandglue.js"/>
-  <script src="chrome://messenger/content/ABSearchDialog.js"/>
-  <script src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/mailWindow.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script type="application/javascript"
+          src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/commandglue.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/ABSearchDialog.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/addressbook/abCommon.js"/>
 
   <broadcaster id="Communicator:WorkMode"/>
 
   <commandset id="abSearchDialogCommands">
     <command id="cmd_close" oncommand="window.close();"/>
   </commandset>
 
   <keyset id="abSearchDialogKeys">
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@@ -55,25 +55,34 @@
         title="&searchDialogTitle.label;"
         style="width: 52em; height: 34em;"
         persist="screenX screenY width height sizemode">
 
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 
-  <script src="chrome://messenger/content/mailWindow.js"/>
-  <script src="chrome://messenger/content/threadPane.js"/>
-  <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-  <script src="chrome://global/content/globalOverlay.js"/>
-  <script src="chrome://messenger/content/mailCommands.js"/>
-  <script src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script src="chrome://messenger/content/commandglue.js"/>
-  <script src="chrome://messenger/content/SearchDialog.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/messengerdnd.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/mailWindow.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/threadPane.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script type="application/javascript"
+          src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/commandglue.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/SearchDialog.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/messengerdnd.js"/>
 
   <commands id="commands">
     <commandset id="mailSearchItems"
                 commandupdater="true"
                 events="mail-search"
                 oncommandupdate="goUpdateSearchItems(this)">
       <command id="cmd_open" oncommand="goDoCommand('cmd_open')" disabled="true"/>
       <command id="button_delete" oncommand="goDoCommand('button_delete')" disabled="true"/>
--- a/mailnews/base/search/resources/content/searchTermOverlay.xul
+++ b/mailnews/base/search/resources/content/searchTermOverlay.xul
@@ -37,18 +37,20 @@
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/searchTermOverlay.dtd" >
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script src="chrome://messenger/content/searchTermOverlay.js"/>
-  <script src="chrome://messenger/content/dateFormat.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/searchTermOverlay.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/dateFormat.js"/>
 
   <vbox id="searchTermListBox">
 
     <radiogroup id="booleanAndGroup" orient="horizontal"
                 selectedItem="or" oncommand="booleanChanged(event);">
       <radio value="and" label="&matchAll.label;" accesskey="&matchAll.accesskey;"/>
       <radio selected="true" value="or" label="&matchAny.label;" accesskey="&matchAny.accesskey;"/>
       <radio value="matchAll" id="matchAllItem" label="&matchAllMsgs.label;" accesskey="&matchAllMsgs.accesskey;"/>
--- a/mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.xul
+++ b/mailnews/extensions/mailviews/resources/content/msgViewPickerOverlay.xul
@@ -37,17 +37,18 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd">
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script src="chrome://messenger/content/msgViewPickerOverlay.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/msgViewPickerOverlay.js"/>
   
   <hbox id="searchBox">
     <hbox id="viewPickerBox" insertbefore="searchCriteria" align="center">
       <label value="&viewPicker.label;" control="viewPicker"/>
       <menulist id="viewPicker" oncommand="ViewChangeByMenuitem(event.target);">
         <menupopup id="viewPickerPopup" onpopupshowing="RefreshViewPopup(this, true);">
           <menuitem id="viewPickerAll"    value="0" label="&viewAll.label;"/>
           <menuitem id="viewPickerUnread" value="1" label="&viewUnread.label;"/>
--- a/suite/common/permissions/cookieViewer.xul
+++ b/suite/common/permissions/cookieViewer.xul
@@ -50,19 +50,22 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         windowtype="mozilla:cookieviewer"
         style="width: 30em;"
         onload="Startup()"
         onunload="Shutdown()"
         ondialoghelp="doHelpButton();"
         persist="screenX screenY width height">
 
-  <script src="chrome://communicator/content/permissions/cookieViewer.js"/>
-  <script src="chrome://communicator/content/permissions/treeUtils.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
+  <script type="application/javascript"
+          src="chrome://communicator/content/permissions/cookieViewer.js"/>
+  <script type="application/javascript"
+          src="chrome://communicator/content/permissions/treeUtils.js"/>
+  <script type="application/javascript"
+          src="chrome://help/content/contextHelp.js" />
 
   <keyset id="dialogKeys"/>
   <stringbundle id="cookieBundle"
                 src="chrome://communicator/locale/permissions/cookieViewer.properties"/>
            
   <tabbox id="tabbox" flex="1">
     <tabs>
       <tab id="cookiesTab" label="&tab.cookiesonsystem.label;" help="cookies_stored"/>