From 1d4a97c220bfbd04a19b92b133dd914e716ebc91 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 24 Feb 2018 04:50:37 -0500
Subject: [PATCH] Fx60 compatibility: Remove versioned JavaScript

---
 chrome/content/zotero/integration/quickFormat.xul          | 4 ++--
 chrome/content/zotero/itemPane.xul                         | 2 +-
 chrome/content/zotero/preferences/preferences.xul          | 2 +-
 chrome/content/zotero/preferences/preferences_advanced.xul | 2 +-
 chrome/content/zotero/preferences/preferences_cite.xul     | 2 +-
 chrome/content/zotero/preferences/preferences_export.xul   | 2 +-
 chrome/content/zotero/preferences/preferences_firefox.xul  | 2 +-
 chrome/content/zotero/preferences/preferences_general.xul  | 2 +-
 chrome/content/zotero/preferences/preferences_search.xul   | 2 +-
 chrome/content/zotero/preferences/preferences_sync.xul     | 2 +-
 chrome/content/zotero/test/test.xul                        | 2 +-
 chrome/content/zotero/zoteroPane.xul                       | 6 +++---
 test/content/runtests.html                                 | 4 ++--
 test/content/runtests.js                                   | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/chrome/content/zotero/integration/quickFormat.xul b/chrome/content/zotero/integration/quickFormat.xul
index 3419f7bb8..d05cbd2f1 100644
--- a/chrome/content/zotero/integration/quickFormat.xul
+++ b/chrome/content/zotero/integration/quickFormat.xul
@@ -41,8 +41,8 @@
 	onunload="Zotero_QuickFormat.onUnload()">
 	
 	<script src="../include.js"/>
-	<script src="windowDraggingUtils.js" type="text/javascript;version=1.8"/>
-	<script src="quickFormat.js" type="text/javascript;version=1.8"/>
+	<script src="windowDraggingUtils.js" type="text/javascript"/>
+	<script src="quickFormat.js" type="text/javascript"/>
 	
 	<box orient="horizontal" id="quick-format-entry"> 
 		<deck id="quick-format-deck" selectedIndex="0" flex="1">
diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul
index 6bc6a5678..ee0e62e79 100644
--- a/chrome/content/zotero/itemPane.xul
+++ b/chrome/content/zotero/itemPane.xul
@@ -30,7 +30,7 @@
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<script src="include.js"/>
-	<script src="itemPane.js" type="application/javascript;version=1.8"/>
+	<script src="itemPane.js" type="application/javascript"/>
 	
 	<vbox id="zotero-item-pane" zotero-persist="width height">
 		<!-- My Publications -->
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index f889e8450..928d8ee1d 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -83,5 +83,5 @@
 		observerService.notifyObservers(null, "charsetmenu-selected", "other");
 	]]>
 	</script>
-	<script src="preferences.js" type="application/javascript;version=1.8"/>
+	<script src="preferences.js" type="application/javascript"/>
 </prefwindow>
diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
index b811225b3..0bc135bc2 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -329,5 +329,5 @@
 		<separator/>
 	</prefpane>
 	
-	<script src="preferences_advanced.js" type="application/javascript;version=1.8"/>
+	<script src="preferences_advanced.js" type="application/javascript"/>
 </overlay>
diff --git a/chrome/content/zotero/preferences/preferences_cite.xul b/chrome/content/zotero/preferences/preferences_cite.xul
index f7ded1125..835b4b91f 100644
--- a/chrome/content/zotero/preferences/preferences_cite.xul
+++ b/chrome/content/zotero/preferences/preferences_cite.xul
@@ -110,5 +110,5 @@
 		</tabbox>
 	</prefpane>
 	
-	<script src="preferences_cite.js" type="application/javascript;version=1.8"/>
+	<script src="preferences_cite.js" type="application/javascript"/>
 </overlay>
diff --git a/chrome/content/zotero/preferences/preferences_export.xul b/chrome/content/zotero/preferences/preferences_export.xul
index d2e40b152..be077df79 100644
--- a/chrome/content/zotero/preferences/preferences_export.xul
+++ b/chrome/content/zotero/preferences/preferences_export.xul
@@ -111,6 +111,6 @@
 		<separator/>
 		<separator/>
 		
-		<script src="preferences_export.js" type="application/javascript;version=1.8"/>
+		<script src="preferences_export.js" type="application/javascript"/>
 	</prefpane>
 </overlay>
diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul
index 8bcc2eb53..3c2c30622 100644
--- a/chrome/content/zotero/preferences/preferences_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_firefox.xul
@@ -90,6 +90,6 @@
 			<separator/>
 		</prefpane>
 		
-		<script src="preferences_proxies.js" type="application/javascript;version=1.8"/>
+		<script src="preferences_proxies.js" type="application/javascript"/>
 	</prefwindow>
 </overlay>
diff --git a/chrome/content/zotero/preferences/preferences_general.xul b/chrome/content/zotero/preferences/preferences_general.xul
index 2ef9b2814..f85578aa5 100644
--- a/chrome/content/zotero/preferences/preferences_general.xul
+++ b/chrome/content/zotero/preferences/preferences_general.xul
@@ -146,5 +146,5 @@
 		<separator/>
 	</prefpane>
 	
-	<script src="preferences_general.js" type="application/javascript;version=1.8"/>
+	<script src="preferences_general.js" type="application/javascript"/>
 </overlay>
diff --git a/chrome/content/zotero/preferences/preferences_search.xul b/chrome/content/zotero/preferences/preferences_search.xul
index 23fdd86fc..771f0357e 100644
--- a/chrome/content/zotero/preferences/preferences_search.xul
+++ b/chrome/content/zotero/preferences/preferences_search.xul
@@ -85,5 +85,5 @@
 		<separator/>
 	</prefpane>
 	
-	<script src="preferences_search.js" type="application/javascript;version=1.8"/>
+	<script src="preferences_search.js" type="application/javascript"/>
 </overlay>
diff --git a/chrome/content/zotero/preferences/preferences_sync.xul b/chrome/content/zotero/preferences/preferences_sync.xul
index 8e961e137..3f56e1baa 100644
--- a/chrome/content/zotero/preferences/preferences_sync.xul
+++ b/chrome/content/zotero/preferences/preferences_sync.xul
@@ -326,5 +326,5 @@
 		<separator/>
 	</prefpane>
 	
-	<script src="preferences_sync.js" type="application/javascript;version=1.8"/>
+	<script src="preferences_sync.js" type="application/javascript"/>
 </overlay>
diff --git a/chrome/content/zotero/test/test.xul b/chrome/content/zotero/test/test.xul
index fa428c4b2..fb2018761 100644
--- a/chrome/content/zotero/test/test.xul
+++ b/chrome/content/zotero/test/test.xul
@@ -11,7 +11,7 @@
 	style="padding:2em">
 	
 	<script src="../include.js"/>
-	<script type="application/javascript;version=1.8" src="test.js"/>
+	<script type="application/javascript" src="test.js"/>
 	
 	<hbox><label>This is a test page.</label></hbox>
 </window>
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index b86764fc1..ff86080c5 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -38,14 +38,14 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
 	<script src="include.js"/>
-	<script src="zoteroPane.js" type="application/javascript;version=1.8"/>
+	<script src="zoteroPane.js" type="application/javascript"/>
 	<script src="fileInterface.js"/>
 	<script src="reportInterface.js"/>
 	<script src="timelineInterface.js"/>
 	<script src="recognizePDFDialog.js"/>
-	<script src="browser.js" type="application/javascript;version=1.8"/>
+	<script src="browser.js" type="application/javascript"/>
 	<script src="lookup.js"/>
-	<script src="locateMenu.js" type="application/javascript;version=1.8"/>
+	<script src="locateMenu.js" type="application/javascript"/>
 	
 	<commandset id="mainCommandSet">
 		<command id="cmd_zotero_reportErrors" oncommand="ZoteroPane_Local.reportErrors();"/>
diff --git a/test/content/runtests.html b/test/content/runtests.html
index 0df4ea6a0..05aa8198d 100644
--- a/test/content/runtests.html
+++ b/test/content/runtests.html
@@ -12,7 +12,7 @@
 	<script src="resource://zotero-unit/co-mocha.js"></script>
 	<script src="resource://zotero-unit/sinon.js"></script>
 	<script src="resource://zotero-unit/pako_inflate.js"></script>
-	<script src="support.js" type="application/javascript;version=1.8"></script>
-	<script src="runtests.js" type="application/javascript;version=1.8"></script>
+	<script src="support.js" type="application/javascript"></script>
+	<script src="runtests.js" type="application/javascript"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/test/content/runtests.js b/test/content/runtests.js
index f41a91127..1ab3e5738 100644
--- a/test/content/runtests.js
+++ b/test/content/runtests.js
@@ -267,7 +267,7 @@ if(run && ZoteroUnit.tests) {
 
 	for(var fname of testFiles) {
 		var el = document.createElement("script");
-		el.type = "application/javascript;version=1.8";
+		el.type = "application/javascript";
 		el.src = "resource://zotero-unit-tests/"+fname;
 		el.async = false;
 		document.body.appendChild(el);