commit d1225c44f7e0c04eb5e41875c445c271df07627c parent 6b2bbf80e13f85157539be1b269dabc2bdb6a4f2 Author: Simon Kornblith <simon@simonster.com> Date: Mon, 18 Feb 2013 16:15:44 -0500 Revert "Add type="application/javascript;version=1.8" to all JS script tags (for now)" This reverts commit 35b1c168584ea59d2c2a236d94717eca99751ec6. Not necessary since Mozilla bug 830665 is fixed Diffstat:
33 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/chrome/content/zotero/about.xul b/chrome/content/zotero/about.xul @@ -13,7 +13,7 @@ onload="moveToAlertPosition(); sizeToContent();" ondialogaccept="return true;"> - <script src="include.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> <vbox id="aboutcontent"> <label id="name" value="Zotero"/> @@ -21,7 +21,7 @@ <label class="zotero-text-link" href="http://zotero.org" value="http://zotero.org"/> </hbox> <label id="version" value="&zotero.version; "/> - <script type="application/javascript;version=1.8"> + <script> document.getElementById('version').value += Zotero.version; </script> <hbox> diff --git a/chrome/content/zotero/advancedSearch.xul b/chrome/content/zotero/advancedSearch.xul @@ -20,8 +20,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" windowtype="zotero:search"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="advancedSearch.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="advancedSearch.js"/> <vbox id="zotero-search-box-container" flex="1"> diff --git a/chrome/content/zotero/bibliography.xul b/chrome/content/zotero/bibliography.xul @@ -8,8 +8,8 @@ id="zotero-bibliography" onload="Zotero_File_Interface_Bibliography.init()"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="bibliography.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="bibliography.js"/> <vbox id="zotero-bibliography-container"> <groupbox> diff --git a/chrome/content/zotero/downloadOverlay.xul b/chrome/content/zotero/downloadOverlay.xul @@ -35,8 +35,8 @@ <overlay id="zotero-download-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="downloadOverlay.js" type="application/javascript;version=1.8"/> + <script type="application/x-javascript" src="include.js"/> + <script type="application/x-javascript" src="downloadOverlay.js"/> <radiogroup id="mode"> <vbox id="zotero-container" flex="1" hidden="true"> <radio id="zotero-radio" label="&zotero.downloadManager.label;" disabled="true"/> diff --git a/chrome/content/zotero/errorReport.xul b/chrome/content/zotero/errorReport.xul @@ -9,7 +9,7 @@ <wizard xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="zotero-error-report" title="Zotero Error Report"> - <script type="application/javascript;version=1.8"> + <script> <![CDATA[ var Zotero_Error_Report = new function() { this.init = init; diff --git a/chrome/content/zotero/exportOptions.xul b/chrome/content/zotero/exportOptions.xul @@ -14,10 +14,10 @@ id="zotero-export-options" onload="Zotero_File_Interface_Export.init()"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="charsetMenu.js" type="application/javascript;version=1.8"/> - <script src="exportOptions.js" type="application/javascript;version=1.8"/> - <script type="application/javascript;version=1.8"> + <script src="include.js"/> + <script src="charsetMenu.js"/> + <script src="exportOptions.js"/> + <script type="application/javascript"> <![CDATA[ var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); observerService.notifyObservers(null, "charsetmenu-selected", "other"); diff --git a/chrome/content/zotero/ingester/selectitems.xul b/chrome/content/zotero/ingester/selectitems.xul @@ -35,8 +35,8 @@ id="zotero-selectitems" onload="Zotero_Ingester_Interface_SelectItems.init()"> - <script src="../include.js" type="application/javascript;version=1.8"/> - <script src="selectitems.js" type="application/javascript;version=1.8"/> + <script src="../include.js"/> + <script src="selectitems.js"/> <vbox id="zotero-select-items-container" flex="1"> <caption label="&zotero.selectitems.intro.label;" id="zotero-selectitems-intro"/> diff --git a/chrome/content/zotero/integration/addCitationDialog.xul b/chrome/content/zotero/integration/addCitationDialog.xul @@ -49,9 +49,9 @@ ondialogextra2="Zotero_Citation_Dialog.toggleEditor()" ondialogextra1="Zotero_Citation_Dialog.toggleMultipleSources()"> - <script src="../include.js" type="application/javascript;version=1.8"/> - <script src="../selectItemsDialog.js" type="application/javascript;version=1.8"/> - <script src="addCitationDialog.js" type="application/javascript;version=1.8"/> + <script src="../include.js"/> + <script src="../selectItemsDialog.js"/> + <script src="addCitationDialog.js"/> <vbox id="zotero-select-items-container" flex="1"> <vbox flex="1"> diff --git a/chrome/content/zotero/integration/editBibliographyDialog.xul b/chrome/content/zotero/integration/editBibliographyDialog.xul @@ -48,9 +48,9 @@ ondialogextra1="Zotero_Bibliography_Dialog.revert()" ondialogextra2="Zotero_Bibliography_Dialog.revertAll()"> - <script src="../include.js" type="application/javascript;version=1.8"/> - <script src="../selectItemsDialog.js" type="application/javascript;version=1.8"/> - <script src="editBibliographyDialog.js" type="application/javascript;version=1.8"/> + <script src="../include.js"/> + <script src="../selectItemsDialog.js"/> + <script src="editBibliographyDialog.js"/> <vbox id="zotero-select-items-container" flex="1"> <vbox flex="1"> diff --git a/chrome/content/zotero/integration/integrationDocPrefs.xul b/chrome/content/zotero/integration/integrationDocPrefs.xul @@ -40,8 +40,8 @@ persist="screenX screenY" style="width: 600px"> - <script src="../include.js" type="application/javascript;version=1.8"/> - <script src="../bibliography.js" type="application/javascript;version=1.8"/> + <script src="../include.js"/> + <script src="../bibliography.js"/> <vbox id="zotero-bibliography-container"> <groupbox> <caption label="&zotero.bibliography.style.label;"/> diff --git a/chrome/content/zotero/integration/quickFormat.xul b/chrome/content/zotero/integration/quickFormat.xul @@ -41,7 +41,7 @@ onkeypress="Zotero_QuickFormat.onKeyPress(event)" onunload="Zotero_QuickFormat.onUnload()"> - <script src="../include.js" type="application/javascript;version=1.8"/> + <script src="../include.js"/> <script src="windowDraggingUtils.js" type="text/javascript;version=1.8"/> <script src="quickFormat.js" type="text/javascript;version=1.8"/> diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul @@ -29,7 +29,7 @@ <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd"> <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <script src="include.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> <script src="itemPane.js" type="application/javascript;version=1.8"/> <vbox id="zotero-item-pane" zotero-persist="width"> diff --git a/chrome/content/zotero/locateManager.xul b/chrome/content/zotero/locateManager.xul @@ -95,8 +95,8 @@ To add a new preference: </groupbox> </prefpane> - <script src="chrome://zotero/content/include.js" type="application/javascript;version=1.8"></script> - <script type="application/javascript;version=1.8"> + <script src="chrome://zotero/content/include.js"></script> + <script type="application/javascript"> <![CDATA[ function treeClick(event) { // We only care about primary button double and triple clicks diff --git a/chrome/content/zotero/longTagFixer.xul b/chrome/content/zotero/longTagFixer.xul @@ -10,8 +10,8 @@ ondialogaccept="Zotero_Long_Tag_Fixer.save()" title="&zotero.sync.error;"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="longTagFixer.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="longTagFixer.js"/> <label value="&zotero.sync.longTagFixer.followingTagTooLong;"/> <groupbox> diff --git a/chrome/content/zotero/merge.xul b/chrome/content/zotero/merge.xul @@ -38,8 +38,8 @@ onwizardcancel="return Zotero_Merge_Window.onCancel()" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="merge.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="merge.js"/> <wizardpage onpageshow="Zotero_Merge_Window.init()" onpagerewound="Zotero_Merge_Window.onBack(); return false" diff --git a/chrome/content/zotero/note.xul b/chrome/content/zotero/note.xul @@ -13,9 +13,9 @@ persist="screenX screenY width height" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="itemPane.js" type="application/javascript;version=1.8"/> - <script src="note.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="itemPane.js"/> + <script src="note.js"/> <keyset> <key id="key_close" key="W" modifiers="accel" command="cmd_close"/> diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul @@ -39,7 +39,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <!-- Include the global XPCOM object --> - <script src="overlay.js" type="application/javascript;version=1.8"/> + <script src="overlay.js"/> <popup id="contentAreaContextMenu"/> diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul @@ -821,13 +821,13 @@ To add a new preference: <!-- These mess up the prefwindow (more) if they come before the prefpanes https://bugzilla.mozilla.org/show_bug.cgi?id=296418 --> - <script src="chrome://zotero/content/include.js" type="application/javascript;version=1.8"></script> - <script src="chrome://zotero/content/charsetMenu.js" type="application/javascript;version=1.8"></script> - <script type="application/javascript;version=1.8"> + <script src="chrome://zotero/content/include.js"></script> + <script src="chrome://zotero/content/charsetMenu.js"></script> + <script type="application/javascript"> <![CDATA[ var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); observerService.notifyObservers(null, "charsetmenu-selected", "other"); ]]> </script> - <script src="preferences.js" type="application/javascript;version=1.8"/> + <script src="preferences.js"/> </prefwindow> diff --git a/chrome/content/zotero/preferences/proxyEditor.xul b/chrome/content/zotero/preferences/proxyEditor.xul @@ -34,8 +34,8 @@ onload="Zotero_ProxyEditor.load();" ondialogaccept="return Zotero_ProxyEditor.accept();"> - <script src="chrome://zotero/content/include.js" type="application/javascript;version=1.8"/> - <script src="proxyEditor.js" type="application/javascript;version=1.8"/> + <script src="chrome://zotero/content/include.js"/> + <script src="proxyEditor.js"/> <checkbox id="zotero-proxies-multiSite" label="&zotero.preferences.proxies.multiSite;" oncommand="Zotero_ProxyEditor.multiSiteChanged()"/> diff --git a/chrome/content/zotero/preferences/quickCopySiteEditor.xul b/chrome/content/zotero/preferences/quickCopySiteEditor.xul @@ -34,10 +34,10 @@ onload="sizeToContent();" ondialogaccept="Zotero_QuickCopySiteEditor.onAccept();"> - <script src="chrome://zotero/content/include.js" type="application/javascript;version=1.8"/> - <script src="preferences.js" type="application/javascript;version=1.8"/> + <script src="chrome://zotero/content/include.js"/> + <script src="preferences.js"/> - <script type="application/javascript;version=1.8"> + <script> <![CDATA[ var Zotero_QuickCopySiteEditor = new function () { this.onAccept = onAccept; diff --git a/chrome/content/zotero/proxy.xul b/chrome/content/zotero/proxy.xul @@ -8,8 +8,8 @@ ondialogaccept="Zotero_Proxy_Dialog.accept()" ondialogcancel="Zotero_Proxy_Dialog.cancel()" onload="Zotero_Proxy_Dialog.init()"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="proxy.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="proxy.js"/> <vbox flex="1" style="width:510px"> <hbox align="start"> diff --git a/chrome/content/zotero/rtfScan.xul b/chrome/content/zotero/rtfScan.xul @@ -8,9 +8,9 @@ title="&zotero.rtfScan.title;" width="700" height="550" id="zotero-rtfScan"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="bibliography.js" type="application/javascript;version=1.8"/> - <script src="rtfScan.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="bibliography.js"/> + <script src="rtfScan.js"/> <wizardpage id="intro-page" label="&zotero.rtfScan.introPage.label;" onpageshow="Zotero_RTFScan.introPageShowing()" diff --git a/chrome/content/zotero/searchDialog.xul b/chrome/content/zotero/searchDialog.xul @@ -16,8 +16,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" style="padding:2em"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="searchDialog.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="searchDialog.js"/> <vbox id="zotero-search-box-container" flex="1"> <hbox align="center"> diff --git a/chrome/content/zotero/selectItemsDialog.xul b/chrome/content/zotero/selectItemsDialog.xul @@ -43,8 +43,8 @@ style="padding:2em" persist="screenX screenY width height"> - <script src="include.js" type="application/javascript;version=1.8"/> - <script src="selectItemsDialog.js" type="application/javascript;version=1.8"/> + <script src="include.js"/> + <script src="selectItemsDialog.js"/> <vbox id="zotero-select-items-container" flex="1"> diff --git a/chrome/content/zotero/standalone/basicViewer.xul b/chrome/content/zotero/standalone/basicViewer.xul @@ -51,8 +51,8 @@ <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> <script type="application/javascript" src="chrome://global/content/printUtils.js"/> <script type="application/javascript" src="chrome://global/content/inlineSpellCheckUI.js"/> - <script type="application/javascript;version=1.8" src="chrome://zotero/content/include.js"/> - <script type="application/javascript;version=1.8" src="basicViewer.js"/> + <script type="application/javascript" src="chrome://zotero/content/include.js"/> + <script type="application/javascript" src="basicViewer.js"/> <commandset id="mainCommandSet"> <!--FILE--> diff --git a/chrome/content/zotero/standalone/extensionsOverlay.xul b/chrome/content/zotero/standalone/extensionsOverlay.xul @@ -4,6 +4,6 @@ <textbox id="header-search" hidden="true"/> <page id="addons-page"> - <script type="application/javascript;version=1.8" src="chrome://zotero/content/standalone/extensionsOverlay.js"/> + <script type="application/javascript" src="chrome://zotero/content/standalone/extensionsOverlay.js"/> </page> </overlay> diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul @@ -48,7 +48,7 @@ title="&brandShortName;" width="915" height="500" persist="screenX screenY width height sizemode"> - <script type="application/javascript;version=1.8" src="standalone.js"/> + <script type="application/javascript" src="standalone.js"/> <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/> <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> <script type="application/javascript" src="chrome://global/content/inlineSpellCheckUI.js"/> diff --git a/chrome/content/zotero/tab.xul b/chrome/content/zotero/tab.xul @@ -25,7 +25,7 @@ xmlns:xhtml="http://www.w3.org/1999/xhtml" disablefastfind="true" flex="1"> - <script type="application/javascript;version=1.8" src="tab.js"/> + <script type="application/javascript" src="tab.js"/> <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> <xhtml:link rel="shortcut icon" diff --git a/chrome/content/zotero/test/modtime.xul b/chrome/content/zotero/test/modtime.xul @@ -8,8 +8,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" style="padding:2em"> - <script src="../include.js" type="application/javascript;version=1.8"/> - <script src="modtime.js" type="application/javascript;version=1.8"/> + <script src="../include.js"/> + <script src="modtime.js"/> <box/> </window> diff --git a/chrome/content/zotero/test/test.xul b/chrome/content/zotero/test/test.xul @@ -10,8 +10,8 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" style="padding:2em"> - <script src="../include.js" type="application/javascript;version=1.8"/> - <script src="test.js" type="application/javascript;version=1.8"/> + <script src="../include.js"/> + <script src="test.js"/> <hbox><label>This is a test page.</label></hbox> </window> diff --git a/chrome/content/zotero/tools/csledit.xul b/chrome/content/zotero/tools/csledit.xul @@ -32,9 +32,9 @@ onload="Zotero_CSL_Editor.init();" title="Zotero Reference Test pane"> - <script src="chrome://zotero/content/include.js" type="application/javascript;version=1.8"/> + <script src="chrome://zotero/content/include.js"/> - <script type="application/javascript;version=1.8"> + <script> <![CDATA[ var Zotero_CSL_Editor = new function() { this.init = init; diff --git a/chrome/content/zotero/tools/cslpreview.xul b/chrome/content/zotero/tools/cslpreview.xul @@ -33,9 +33,9 @@ onload="Zotero_CSL_Preview.init();" title="Zotero Preview pane"> - <script src="chrome://zotero/content/include.js" type="application/javascript;version=1.8"/> + <script src="chrome://zotero/content/include.js"/> - <script type="application/javascript;version=1.8"> + <script> <![CDATA[ default xml namespace = "http://purl.org/net/xbiblio/csl"; diff --git a/chrome/content/zotero/upgrade.xul b/chrome/content/zotero/upgrade.xul @@ -9,7 +9,7 @@ <wizard id="zotero-schema-upgrade" title="Zotero Upgrade Wizard" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <script type="application/javascript;version=1.8"> + <script> <![CDATA[ var Zotero_Schema_Upgrade = new function() { this.init = init;