Citation dialog search improvements. Closes #1770. Closes #1499

Allows "p123" in addition to ":123" and "p.123" when specifying
the locator;
Allows searches with numbers only.
This commit is contained in:
Adomas Venčkauskas 2020-01-06 13:55:52 +02:00
parent 51792ba242
commit 7c1845b3af

View file

@ -26,9 +26,9 @@ Components.utils.import("resource://gre/modules/Services.jsm");
var Zotero_QuickFormat = new function () {
const pixelRe = /^([0-9]+)px$/
const specifiedLocatorRe = /^(?:,? *(p{0,2})(?:\. *| +)|:)([0-9\-]+) *$/;
const specifiedLocatorRe = /^(?:,? *(p{1,2})(?:\. *| *)|:)([0-9\-]+) *$/;
const yearRe = /,? *([0-9]+) *(B[. ]*C[. ]*(?:E[. ]*)?|A[. ]*D[. ]*|C[. ]*E[. ]*)?$/i;
const locatorRe = /(?:,? *(p{0,2})\.?|(\:)) *([0-9\-]+)$/i;
const locatorRe = /(?:, *(p{0,2})\.?|(\:)) *([0-9\-]+)$/i;
const creatorSplitRe = /(?:,| *(?:and|\&)) +/;
const charRe = /[\w\u007F-\uFFFF]/;
const numRe = /^[0-9\-]+$/;
@ -273,7 +273,6 @@ var Zotero_QuickFormat = new function () {
}
// check for year and pages
str = _updateLocator(str);
m = yearRe.exec(str);
if(m) {
year = parseInt(m[1]);