mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

RTF Scan fixes

Browse source 
- Firefox 46 compatibility
- Stretched progress meters

Partial backport of c5716a395f
This commit is contained in:
Dan Stillman 2016-05-07 13:18:22 -04:00
parent c7c271f2c4
commit e5edd12371
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/rtfScan.js
View file

@ -341,7 +341,9 @@ var Zotero_RTFScan = new function() {
var m = initialRe.exec(firstName); var m = initialRe.exec(firstName);
if(m) { if(m) {
var initials = firstName.replace(/[^A-Z]/g, ""); 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; if(initials != itemInitials) return false;
} else { } else {
// not all initials; verify that the first name matches // not all initials; verify that the first name matches

4
chrome/content/zotero/rtfScan.xul
View file

@ -45,7 +45,7 @@
<wizardpage id="scan-page" label="&zotero.rtfScan.scanPage.label;" <wizardpage id="scan-page" label="&zotero.rtfScan.scanPage.label;"
onpageshow="Zotero_RTFScan.scanPageShowing()"> onpageshow="Zotero_RTFScan.scanPageShowing()">
<description width="700">&zotero.rtfScan.scanPage.description;</description> <description width="700">&zotero.rtfScan.scanPage.description;</description>
<progressmeter id="progress-indicator" mode="undetermined" flex="1"/> <progressmeter id="progress-indicator" mode="undetermined"/>
</wizardpage> </wizardpage>
<wizardpage id="citations-page" label="&zotero.rtfScan.citationsPage.label;" <wizardpage id="citations-page" label="&zotero.rtfScan.citationsPage.label;"
@ -107,7 +107,7 @@
<wizardpage id="format-page" label="&zotero.rtfScan.formatPage.label;" <wizardpage id="format-page" label="&zotero.rtfScan.formatPage.label;"
onpageshow="Zotero_RTFScan.formatPageShowing()"> onpageshow="Zotero_RTFScan.formatPageShowing()">
<description width="700">&zotero.rtfScan.formatPage.description;</description> <description width="700">&zotero.rtfScan.formatPage.description;</description>
<progressmeter id="progress-indicator" mode="undetermined" flex="1"/> <progressmeter id="progress-indicator" mode="undetermined"/>
</wizardpage> </wizardpage>
<wizardpage id="complete-page" label="&zotero.rtfScan.completePage.label;"> <wizardpage id="complete-page" label="&zotero.rtfScan.completePage.label;">