Bug 381467 - Switch application/x-javascript to application/javascript; (Av1) /security/manager/pki/*

r=honzab

security/manager/pki/resources/content/certManager.xul

@@ -56,9 +56,9 @@
         style="width: 48em; height: 32em;"
         persist="screenX screenY width height">
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/certManager.js"/>
 
   <vbox flex="1">
     <tabbox id="certmanagertabs" flex="1" style="margin:5px" persist="selectedIndex">

security/manager/pki/resources/content/certViewer.xul

@@ -54,9 +54,9 @@
   buttonaccesskeyaccept="&certmgr.close.accesskey;"
   onload="setWindowName();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/viewCertDetails.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/viewCertDetails.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
 
   <tabbox>
     <tabs>

security/manager/pki/resources/content/certerror.xul

@@ -54,9 +54,9 @@
   buttonaccesskeyextra1="&examineCert.accesskey;"
   ondialogextra1="viewCert();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/certerror.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/certerror.js"/>
 
 <hbox>
   <vbox>

security/manager/pki/resources/content/certpicker.xul

@@ -50,8 +50,8 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/certpicker.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/certpicker.js"/>
 
   <hbox align="center">
     <broadcaster id="certSelected" oncommand="onCertSelected();"/>

security/manager/pki/resources/content/changepassword.xul

@@ -47,8 +47,8 @@
   ondialogaccept="return setPassword();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/password.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
 
 <hbox align="center">
   <label value="&setPassword.tokenName.label;: "/>

security/manager/pki/resources/content/choosetoken.xul

@@ -52,9 +52,9 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/choosetoken.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/choosetoken.js"/>
 
   <groupbox>
     <description>&chooseToken.message1;</description>

security/manager/pki/resources/content/clientauthask.xul

@@ -51,9 +51,9 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/clientauthask.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/clientauthask.js"/>
 
   <groupbox>
     <description style="font-weight: bold;">&clientAuthAsk.message1;</description>

security/manager/pki/resources/content/createCertInfo.xul

@@ -45,9 +45,9 @@
   onload="onLoad();"
   onclose="onClose();"
 >
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="pippki.js" />
-<script type="application/x-javascript" src="createCertInfo.js" />
+<script type="application/javascript" src="chrome://global/content/strres.js" />
+<script type="application/javascript" src="pippki.js" />
+<script type="application/javascript" src="createCertInfo.js" />
 
 <vbox style="margin: 5px; max-width: 50em;">
 

security/manager/pki/resources/content/crlImportDialog.xul

@@ -48,9 +48,9 @@
   ondialogaccept="return onAccept();"
   ondialogcancel="return onCancel();">
   
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <script type="application/x-javascript" src="chrome://pippki/content/crlImportDialog.js" />
-  <script type="application/x-javascript" src="pippki.js" />
+  <script type="application/javascript" src="chrome://global/content/strres.js" />
+  <script type="application/javascript" src="chrome://pippki/content/crlImportDialog.js" />
+  <script type="application/javascript" src="pippki.js" />
 
   <vbox style="margin: 5px;" flex="1">
 

security/manager/pki/resources/content/crlManager.xul

@@ -57,8 +57,8 @@
         persist="screenX screenY width height">
 
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/crlManager.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/crlManager.js"/>
 
   <description value="&validation.crlmanager.description;"/>
   <separator class="thin"/>

security/manager/pki/resources/content/deletecert.xul

@@ -48,9 +48,9 @@
   ondialogaccept="return doOK();"
   ondialogcancel="return doCancel();">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/deletecert.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <script type="application/x-javascript" src="pippki.js" />
+  <script type="application/javascript" src="chrome://pippki/content/deletecert.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js" />
+  <script type="application/javascript" src="pippki.js" />
 
   <description id="confirm" style="width: 400px;"/>
   <separator />

security/manager/pki/resources/content/device_manager.xul

@@ -55,8 +55,8 @@
         onload="LoadModules();"
         buttons="accept">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/device_manager.js"/>
 
 <grid flex="1" style="margin:5px">
   <columns>

security/manager/pki/resources/content/downloadcert.xul

@@ -48,9 +48,9 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/downloadcert.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/downloadcert.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
 
 
   <!--  Let 'em know what they're doing -->

security/manager/pki/resources/content/editcacert.xul

@@ -49,9 +49,9 @@
         onload="setWindowName();"
 >
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/editcerts.js"/>
 
   <description id="certmsg"/>
   <separator/>

security/manager/pki/resources/content/editemailcert.xul

@@ -49,9 +49,9 @@
         onload="doLoadForEmailCert();"
 >
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/editcerts.js"/>
 
   <description id="certmsg"/>
   <description id="issuer"/>

security/manager/pki/resources/content/editsslcert.xul

@@ -49,9 +49,9 @@
         onload="doLoadForSSLCert();"
 >
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/editcerts.js"/>
 
   <description id="certmsg"/>
   <description id="issuer"/>

security/manager/pki/resources/content/escrowWarn.xul

@@ -52,9 +52,9 @@
   ondialogextra2="viewCert();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/escrowWarn.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/escrowWarn.js"/>
 
   <description>&escrowWarn.message1;</description>
   <separator/>

security/manager/pki/resources/content/exceptionDialog.xul

@@ -56,9 +56,9 @@
         persist="screenX screenY width height"
         defaultButton="extra2">
   
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/exceptionDialog.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/exceptionDialog.js"/>
   
   <hbox>
     <vbox>

security/manager/pki/resources/content/formsigning.xul

@@ -51,9 +51,9 @@
 
 <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/formsigning.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/formsigning.js"/>
 
   <description id="sign.intro" style="max-width: 50em;"/>
   <textbox readonly="true" id="sign.text" multiline="true"

security/manager/pki/resources/content/getp12password.xul

@@ -49,7 +49,7 @@
   ondialogaccept="return getPassword();"
   onload="onP12Load(false);">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/password.js"/>
 
   <description>&pkcs12.getpassword.message;</description>
   <separator />

security/manager/pki/resources/content/getpassword.xul

@@ -49,8 +49,8 @@
   ondialogaccept="return getPassword();"
   onload="onLoad();">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
 
   <hbox>
     <label value="&getPassword.tokenName2.label;"/>

security/manager/pki/resources/content/load_device.xul

@@ -52,8 +52,8 @@
         buttons="accept,cancel"
         ondialogaccept="return doLoadDevice();">
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/device_manager.js"/>
 
   <description>&loaddevice.info;</description>
   <hbox align="center">

security/manager/pki/resources/content/pref-crlupdate.xul

@@ -48,9 +48,9 @@
   ondialogaccept="return onAccept();"
   ondialogcancel="return onCancel();">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <script type="application/x-javascript" src="chrome://pippki/content/pref-crlupdate.js" />
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js" />
+  <script type="application/javascript" src="chrome://pippki/content/pref-crlupdate.js" />
 
   <vbox style="margin: 5px;" flex="1">
     <checkbox label="&validation.crl.autoupdate.enable.label;" 

security/manager/pki/resources/content/protectedAuth.xul

@@ -44,10 +44,10 @@
   onload="onLoad();"
   onclose="onClose();"
 >
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="pippki.js" />
-<script type="application/x-javascript" src="protectedAuth.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+<script type="application/javascript" src="chrome://global/content/strres.js" />
+<script type="application/javascript" src="pippki.js" />
+<script type="application/javascript" src="protectedAuth.js" />
+<script type="application/javascript" src="chrome://help/content/help.js" />
 
 <vbox style="margin: 5px; max-width: 50em;">
 

security/manager/pki/resources/content/resetpassword.xul

@@ -49,8 +49,8 @@
 
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/resetpassword.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/resetpassword.js"/>
 
   <hbox flex="1">
     <vbox>

security/manager/pki/resources/content/serverCrlNextupdate.xul

@@ -53,9 +53,9 @@
   ondialoghelp="openHelp('exp_crl');"
   onload="onLoad();"
 >
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js" />
-<script type="application/x-javascript" src="chrome://pippki/content/serverCrlNextupdate.js" />
+<script type="application/javascript" src="chrome://global/content/strres.js" />
+<script type="application/javascript" src="chrome://pippki/content/pippki.js" />
+<script type="application/javascript" src="chrome://pippki/content/serverCrlNextupdate.js" />
 
   <description id="message1"/>
   <separator/>

security/manager/pki/resources/content/setp12password.xul

@@ -49,7 +49,7 @@
   ondialogaccept="return setP12Password();"
   onload="onP12Load(true);">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/password.js"/>
 
   <description>&pkcs12.setpassword.message;</description>
   <separator />