suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attachment filenames based on item data didn't include other characters in the format string (such as spaces and hyphens)

Browse Source
This commit is contained in:
Dan Stillman 2008-01-23 08:29:11 +00:00
parent 81292f75d1
commit f7777ae108
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chrome/content/zotero/xpcom/attachments.js
View File

@ -828,21 +828,21 @@ Zotero.Attachments = new function(){
var value = item.getField(field, false, true);
}
var re = new RegExp("\{?([^%\{\}]*)" + rpl + "(\{[0-9]+\})?" + "([^%\{\}]*)\}?");
// If no value for this field, strip entire conditional block
// (within curly braces)
if (!value) {
var re = new RegExp("\{[^%]*" + rpl + "(\{[0-9]+\})?" + "[^%]*\}");
if (str.match(re)) {
return str.replace(re, '')
}
}
var f = function(match) {
var chars = match.match(/{([0-9]+)}/);
return (chars) ? value.substr(0, chars[1]) : value;
var f = function(match, p1, p2, p3) {
var maxChars = p2 ? p2.replace(/[^0-9]+/g, '') : false;
return p1 + (maxChars ? value.substr(0, maxChars) : value) + p3;
}
var re = new RegExp("(\{[^%]*)?" + rpl + "(\{[0-9]+\})?" + "([^%]*\})?");
return str.replace(re, f);
}