From e5edd12371480fc2e568e63a9a10aa21e4f11763 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 7 May 2016 13:18:22 -0400
Subject: [PATCH] RTF Scan fixes

- Firefox 46 compatibility
- Stretched progress meters

Partial backport of c5716a395f0ae42e46d7d1cccf40e2d9f9e06ed0
---
 chrome/content/zotero/rtfScan.js  | 4 +++-
 chrome/content/zotero/rtfScan.xul | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/rtfScan.js b/chrome/content/zotero/rtfScan.js
index ffa9cc7884..d4c4b5cbd9 100644
--- a/chrome/content/zotero/rtfScan.js
+++ b/chrome/content/zotero/rtfScan.js
@@ -341,7 +341,9 @@ var Zotero_RTFScan = new function() {
 				var m = initialRe.exec(firstName);
 				if(m) {
 					var initials = firstName.replace(/[^A-Z]/g, "");
-					var itemInitials = [name[0].toUpperCase() for each (name in itemCreator.ref.firstName.split(/ +/g))].join("");
+					var itemInitials = itemCreator.firstName.split(/ +/g)
+						.map(name => name[0].toUpperCase())
+						.join("");
 					if(initials != itemInitials) return false;
 				} else {
 					// not all initials; verify that the first name matches
diff --git a/chrome/content/zotero/rtfScan.xul b/chrome/content/zotero/rtfScan.xul
index 1c533101d5..1b83e42ad8 100644
--- a/chrome/content/zotero/rtfScan.xul
+++ b/chrome/content/zotero/rtfScan.xul
@@ -45,7 +45,7 @@
 	<wizardpage id="scan-page" label="&zotero.rtfScan.scanPage.label;"
 	onpageshow="Zotero_RTFScan.scanPageShowing()">
 		<description width="700">&zotero.rtfScan.scanPage.description;</description>
-		<progressmeter id="progress-indicator" mode="undetermined" flex="1"/>
+		<progressmeter id="progress-indicator" mode="undetermined"/>
 	</wizardpage>
 	
 	<wizardpage id="citations-page" label="&zotero.rtfScan.citationsPage.label;"
@@ -107,7 +107,7 @@
 	<wizardpage id="format-page" label="&zotero.rtfScan.formatPage.label;"
 	onpageshow="Zotero_RTFScan.formatPageShowing()">
 		<description width="700">&zotero.rtfScan.formatPage.description;</description>
-		<progressmeter id="progress-indicator" mode="undetermined" flex="1"/>
+		<progressmeter id="progress-indicator" mode="undetermined"/>
 	</wizardpage>
 	
 	<wizardpage id="complete-page" label="&zotero.rtfScan.completePage.label;">