diff --git a/chrome/content/zotero/tools/csledit.js b/chrome/content/zotero/tools/csledit.js
index 1bcbc6a91..5234ec5aa 100644
--- a/chrome/content/zotero/tools/csledit.js
+++ b/chrome/content/zotero/tools/csledit.js
@@ -27,39 +27,32 @@ var Zotero_CSL_Editor = new function() {
this.init = init;
this.handleKeyPress = handleKeyPress;
this.loadCSL = loadCSL;
- this.generateBibliography = generateBibliography;
- this.refresh = refresh;
function init() {
- var cslList = document.getElementById('zotero-csl-list');
- if (cslList.getAttribute('initialized') == 'true') {
- if (currentStyle) {
- loadCSL(currentStyle);
- refresh();
- }
- return;
- }
+ Zotero.Styles.populateLocaleList(document.getElementById("locale-menu"));
- var rawDefaultStyle = Zotero.Prefs.get('export.quickCopy.setting');
- var defaultStyle = Zotero.QuickCopy.stripContentType(rawDefaultStyle);
+ var cslList = document.getElementById('zotero-csl-list');
+ cslList.removeAllItems();
+
+ var lastStyle = Zotero.Prefs.get('export.lastStyle');
var styles = Zotero.Styles.getAll();
var currentStyle = null;
- var listPos = 0;
for each(var style in styles) {
if (style.source) {
continue;
}
var item = cslList.appendItem(style.title, style.styleID);
- if (!currentStyle || defaultStyle == ('bibliography=' + style.styleID)) {
- currentStyle = style.styleID;
- cslList.selectedIndex = listPos;
+ if (!currentStyle && lastStyle == style.styleID) {
+ currentStyle = style;
+ cslList.selectedItem = item;
}
- listPos += 1;
}
+
if (currentStyle) {
- loadCSL(currentStyle);
- refresh();
+ // Call asynchronously, see note in Zotero.Styles
+ window.setTimeout(this.onStyleSelected.bind(this, currentStyle.styleID), 1);
}
+
var pageList = document.getElementById('zotero-csl-page-type');
var locators = Zotero.Cite.labels;
for each(var type in locators) {
@@ -69,13 +62,25 @@ var Zotero_CSL_Editor = new function() {
}
pageList.selectedIndex = 0;
- cslList.setAttribute('initialized', true);
}
- function refresh() {
- var editor = document.getElementById('zotero-csl-editor');
- generateBibliography(editor.value);
-
+
+ this.onStyleSelected = function(styleID) {
+ Zotero.Prefs.set('export.lastStyle', styleID);
+ let style = Zotero.Styles.get(styleID);
+ Zotero.Styles.updateLocaleList(
+ document.getElementById("locale-menu"),
+ style,
+ Zotero.Prefs.get('export.lastLocale')
+ );
+
+ loadCSL(style.styleID);
+ this.refresh();
}
+
+ this.refresh = function() {
+ this.generateBibliography(this.loadStyleFromEditor());
+ }
+
this.save = function() {
var editor = document.getElementById('zotero-csl-editor');
var style = editor.value;
@@ -120,20 +125,52 @@ var Zotero_CSL_Editor = new function() {
document.getElementById('zotero-csl-list').value = cslID;
}
+ this.loadStyleFromEditor = function() {
+ var styleObject;
+ try {
+ styleObject = new Zotero.Style(
+ document.getElementById('zotero-csl-editor').value
+ );
+ } catch(e) {
+ document.getElementById('zotero-csl-preview-box')
+ .contentDocument.documentElement.innerHTML = ''
+ + Zotero.getString('styles.editor.warning.parseError')
+ + '
' + e + '
';
+ throw e;
+ }
+
+ return styleObject;
+ }
- function generateBibliography(str) {
- var editor = document.getElementById('zotero-csl-editor')
+ this.onStyleModified = function(str) {
+ document.getElementById('zotero-csl-list').selectedIndex = -1;
+
+ let styleObject = this.loadStyleFromEditor();
+
+ Zotero.Styles.updateLocaleList(
+ document.getElementById("locale-menu"),
+ styleObject,
+ Zotero.Prefs.get('export.lastLocale')
+ );
+ Zotero_CSL_Editor.generateBibliography(styleObject);
+ }
+
+ this.generateBibliography = function(style) {
var iframe = document.getElementById('zotero-csl-preview-box');
var items = Zotero.getActiveZoteroPane().getSelectedItems();
if (items.length == 0) {
- iframe.contentDocument.documentElement.innerHTML = '' + Zotero.getString('styles.editor.warning.noItems') + '
';
+ iframe.contentDocument.documentElement.innerHTML =
+ ''
+ + Zotero.getString('styles.editor.warning.noItems')
+ + '
';
return;
}
- var styleObject, styleEngine;
+
+ var selectedLocale = document.getElementById("locale-menu").value;
+ var styleEngine;
try {
- styleObject = new Zotero.Style(str);
- styleEngine = styleObject.getCiteProc();
+ styleEngine = style.getCiteProc(style.locale || selectedLocale);
} catch(e) {
iframe.contentDocument.documentElement.innerHTML = '' + Zotero.getString('styles.editor.warning.parseError') + '
'+e+'
';
throw e;
diff --git a/chrome/content/zotero/tools/csledit.xul b/chrome/content/zotero/tools/csledit.xul
index f646d266f..a46192ac9 100644
--- a/chrome/content/zotero/tools/csledit.xul
+++ b/chrome/content/zotero/tools/csledit.xul
@@ -58,12 +58,13 @@
diff --git a/chrome/content/zotero/tools/cslpreview.js b/chrome/content/zotero/tools/cslpreview.js
index fcc9828af..8ff06009d 100644
--- a/chrome/content/zotero/tools/cslpreview.js
+++ b/chrome/content/zotero/tools/cslpreview.js
@@ -30,7 +30,10 @@ var Zotero_CSL_Preview = new function() {
this.generateBibliography = generateBibliography;
function init() {
- //refresh();
+ var menulist = document.getElementById("locale-menu");
+
+ Zotero.Styles.populateLocaleList(menulist);
+ menulist.value = Zotero.Prefs.get('export.lastLocale');;
var iframe = document.getElementById('zotero-csl-preview-box');
iframe.contentDocument.documentElement.innerHTML = '' + Zotero.getString('styles.preview.instructions') + '
';
@@ -86,7 +89,9 @@ var Zotero_CSL_Preview = new function() {
Zotero.debug("CSL IGNORE: citation format is " + style.categories);
return '';
}
- var styleEngine = style.getCiteProc();
+
+ var locale = document.getElementById("locale-menu").value;
+ var styleEngine = style.getCiteProc(locale);
// Generate multiple citations
var citations = styleEngine.previewCitationCluster(
diff --git a/chrome/content/zotero/tools/cslpreview.xul b/chrome/content/zotero/tools/cslpreview.xul
index 0b984577a..3f60c1f04 100644
--- a/chrome/content/zotero/tools/cslpreview.xul
+++ b/chrome/content/zotero/tools/cslpreview.xul
@@ -56,6 +56,8 @@
} - A promise for the created attachment item
*/
this.importFromURL = Zotero.Promise.coroutine(function* (options) {
- Zotero.debug('Importing attachment from URL');
+ Zotero.debug('Importing attachment from URL ' + url);
var libraryID = options.libraryID;
var url = options.url;
@@ -641,7 +643,7 @@ Zotero.Attachments = new function(){
attachmentItem.setField('accessDate', "CURRENT_TIMESTAMP");
attachmentItem.parentID = parentItemID;
attachmentItem.attachmentLinkMode = Zotero.Attachments.LINK_MODE_IMPORTED_URL;
- attachmentItem.attachmentCharset = document.characterSet;
+ attachmentItem.attachmentCharset = 'utf-8'; // WPD will output UTF-8
attachmentItem.attachmentContentType = contentType;
if (collections) {
attachmentItem.setCollections(collections);
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index 5dfc65134..396ceecc3 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -358,6 +358,13 @@ Zotero.Item.prototype._parseRowData = function(row) {
val = val !== null ? parseInt(val) : false;
break;
+ case 'attachmentPath':
+ // Ignore .zotero* files that were relinked before we started blocking them
+ if (!val || val.startsWith('.zotero')) {
+ val = '';
+ }
+ break;
+
// Boolean
case 'synced':
case 'deleted':
@@ -2230,6 +2237,11 @@ Zotero.Item.prototype.getFilePathAsync = Zotero.Promise.coroutine(function* (ski
if (Zotero.isWin || path.indexOf('/') != -1) {
path = Zotero.File.getValidFileName(path, true);
}
+ // Ignore .zotero* files that were relinked before we started blocking them
+ if (path.startsWith(".zotero")) {
+ Zotero.debug("Ignoring attachment file " + path, 2);
+ return false;
+ }
var file = Zotero.Attachments.getStorageDirectory(this);
file.QueryInterface(Components.interfaces.nsILocalFile);
file.setRelativeDescriptor(file, path);
@@ -2496,26 +2508,56 @@ Zotero.Item.prototype.relinkAttachmentFile = Zotero.Promise.coroutine(function*
}
var fileName = OS.Path.basename(path);
-
+ if (fileName.endsWith(".lnk")) {
+ throw new Error("Cannot relink to Windows shortcut");
+ }
var newName = Zotero.File.getValidFileName(fileName);
if (!newName) {
throw new Error("No valid characters in filename after filtering");
}
- // Rename file to filtered name if necessary
- if (fileName != newName) {
- Zotero.debug("Renaming file '" + fileName + "' to '" + newName + "'");
- OS.File.move(path, OS.Path.join(OS.Path.dirname(path), newName), { noOverwrite: true });
+ var newPath = OS.Path.join(OS.Path.dirname(path), newName);
+
+ try {
+ // If selected file isn't in the attachment's storage directory,
+ // copy it in and use that one instead
+ var storageDir = Zotero.Attachments.getStorageDirectory(this.id).path;
+ if (this.isImportedAttachment() && OS.Path.dirname(path) != storageDir) {
+ // If file with same name already exists in the storage directory,
+ // move it out of the way
+ let deleteBackup = false;;
+ if (yield OS.File.exists(newPath)) {
+ deleteBackup = true;
+ yield OS.File.move(newPath, newPath + ".bak");
+ }
+
+ let newFile = Zotero.File.copyToUnique(path, newPath);
+ newPath = newFile.path;
+
+ // Delete backup file
+ if (deleteBackup) {
+ yield OS.File.remove(newPath + ".bak");
+ }
+ }
+ // Rename file to filtered name if necessary
+ else if (fileName != newName) {
+ Zotero.debug("Renaming file '" + fileName + "' to '" + newName + "'");
+ OS.File.move(path, newPath, { noOverwrite: true });
+ }
+ }
+ catch (e) {
+ Zotero.logError(e);
+ return false;
}
- this.attachmentPath = Zotero.Attachments.getPath(file, linkMode);
+ this.attachmentPath = Zotero.Attachments.getPath(Zotero.File.pathToFile(newPath), linkMode);
yield this.save({
skipDateModifiedUpdate: true,
skipClientDateModifiedUpdate: skipItemUpdate
});
- return false;
+ return true;
});
@@ -4010,7 +4052,7 @@ Zotero.Item.prototype.toJSON = Zotero.Promise.coroutine(function* (options) {
// Notes and embedded attachment notes
yield this.loadNote();
let note = this.getNote();
- if (note !== "" || mode == 'full') {
+ if (note !== "" || mode == 'full' || (mode == 'new' && this.isNote())) {
obj.note = note;
}
diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js
index f99a40510..6ca906ab7 100644
--- a/chrome/content/zotero/xpcom/file.js
+++ b/chrome/content/zotero/xpcom/file.js
@@ -576,12 +576,15 @@ Zotero.File = new function(){
this.copyToUnique = function (file, newFile) {
+ file = this.pathToFile(file);
+ newFile = this.pathToFile(newFile);
+
newFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
var newName = newFile.leafName;
newFile.remove(null);
// Copy file to unique name
- file.copyTo(newFile.parent, newName);
+ file.copyToFollowingLinks(newFile.parent, newName);
return newFile;
}
@@ -681,6 +684,8 @@ Zotero.File = new function(){
// Strip characters not valid in XML, since they won't sync and they're probably unwanted
fileName = fileName.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\ud800-\udfff\ufffe\uffff]/g, '');
}
+ // Don't allow hidden files
+ fileName = fileName.replace(/^\./, '');
// Don't allow blank or illegal filenames
if (!fileName || fileName == '.' || fileName == '..') {
fileName = '_';
diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js
index bce80884e..31441be1f 100644
--- a/chrome/content/zotero/xpcom/fulltext.js
+++ b/chrome/content/zotero/xpcom/fulltext.js
@@ -81,7 +81,7 @@ Zotero.Fulltext = new function(){
this.decoder = Components.classes["@mozilla.org/intl/utf8converterservice;1"].
getService(Components.interfaces.nsIUTF8ConverterService);
- var platform = Zotero.platform.replace(' ', '-');
+ var platform = Zotero.platform.replace(/ /g, '-');
_pdfConverterFileName = this.pdfConverterName + '-' + platform;
_pdfInfoFileName = this.pdfInfoName + '-' + platform;
if (Zotero.isWin) {
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 6862d75aa..7aa7a68b0 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -2039,7 +2039,7 @@ Zotero.Integration.Session.prototype.setData = function(data, resetStyle) {
try {
var getStyle = Zotero.Styles.get(data.style.styleID);
data.style.hasBibliography = getStyle.hasBibliography;
- this.style = getStyle.getCiteProc(data.prefs.automaticJournalAbbreviations);
+ this.style = getStyle.getCiteProc(data.locale, data.prefs.automaticJournalAbbreviations);
this.style.setOutputFormat("rtf");
this.styleClass = getStyle.class;
this.dateModified = new Object();
@@ -2069,6 +2069,7 @@ Zotero.Integration.Session.prototype.setDocPrefs = function(doc, primaryFieldTyp
if(this.data) {
io.style = this.data.style.styleID;
+ io.locale = this.data.locale;
io.useEndnotes = this.data.prefs.noteType == 0 ? 0 : this.data.prefs.noteType-1;
io.fieldType = this.data.prefs.fieldType;
io.primaryFieldType = primaryFieldType;
@@ -2091,13 +2092,19 @@ Zotero.Integration.Session.prototype.setDocPrefs = function(doc, primaryFieldTyp
var data = new Zotero.Integration.DocumentData();
data.sessionID = oldData.sessionID;
data.style.styleID = io.style;
+ data.locale = io.locale;
data.prefs.fieldType = io.fieldType;
data.prefs.storeReferences = io.storeReferences;
data.prefs.automaticJournalAbbreviations = io.automaticJournalAbbreviations;
+ var localeChanged = false;
+ if (!oldData.locale || (oldData.locale != io.locale)) {
+ localeChanged = true;
+ }
+
me.setData(data, oldData &&
- oldData.prefs.automaticJournalAbbreviations !=
- data.prefs.automaticJournalAbbreviations);
+ (oldData.prefs.automaticJournalAbbreviations !=
+ data.prefs.automaticJournalAbbreviations || localeChanged));
// need to do this after setting the data so that we know if it's a note style
me.data.prefs.noteType = me.style && me.styleClass == "note" ? io.useEndnotes+1 : 0;
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 57a2da6fa..e3d66093a 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -2490,12 +2490,12 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event) {
event.dataTransfer.setData("text/plain", text);
}
+ format = Zotero.QuickCopy.unserializeSetting(format);
try {
- var [mode, ] = format.split('=');
- if (mode == 'export') {
+ if (format.mode == 'export') {
Zotero.QuickCopy.getContentFromItems(items, format, exportCallback);
}
- else if (mode.indexOf('bibliography') == 0) {
+ else if (format.mode == 'bibliography') {
var content = Zotero.QuickCopy.getContentFromItems(items, format, null, event.shiftKey);
if (content) {
if (content.html) {
@@ -2505,12 +2505,12 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event) {
}
}
else {
- Components.utils.reportError("Invalid Quick Copy mode '" + mode + "'");
+ Components.utils.reportError("Invalid Quick Copy mode");
}
}
catch (e) {
Zotero.debug(e);
- Components.utils.reportError(e + " with format '" + format + "'");
+ Components.utils.reportError(e + " with '" + format.id + "'");
}
};
@@ -2631,7 +2631,7 @@ Zotero.ItemTreeView.fileDragDataProvider.prototype = {
}
}
- parentDir.copyTo(destDir, newName ? newName : dirName);
+ parentDir.copyToFollowingLinks(destDir, newName ? newName : dirName);
// Store nsIFile
if (useTemp) {
@@ -2672,7 +2672,7 @@ Zotero.ItemTreeView.fileDragDataProvider.prototype = {
}
}
- file.copyTo(destDir, newName ? newName : null);
+ file.copyToFollowingLinks(destDir, newName ? newName : null);
// Store nsIFile
if (useTemp) {
@@ -3044,6 +3044,13 @@ Zotero.ItemTreeView.prototype.drop = Zotero.Promise.coroutine(function* (row, or
});
}
else {
+ if (file.leafName.endsWith(".lnk")) {
+ let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+ .getService(Components.interfaces.nsIWindowMediator);
+ let win = wm.getMostRecentWindow("navigator:browser");
+ win.ZoteroPane.displayCannotAddShortcutMessage(file.path);
+ continue;
+ }
yield Zotero.Attachments.importFromFile({
file: file,
libraryID: targetLibraryID,
diff --git a/chrome/content/zotero/xpcom/quickCopy.js b/chrome/content/zotero/xpcom/quickCopy.js
index c33e7193f..75e644b70 100644
--- a/chrome/content/zotero/xpcom/quickCopy.js
+++ b/chrome/content/zotero/xpcom/quickCopy.js
@@ -25,10 +25,6 @@
Zotero.QuickCopy = new function() {
- this.getContentType = getContentType;
- this.stripContentType = stripContentType;
- this.getContentFromItems = getContentFromItems;
-
var _siteSettings;
var _formattedNames;
@@ -46,11 +42,51 @@ Zotero.QuickCopy = new function() {
});
+ /*
+ * Return Quick Copy setting object from string, stringified object, or object
+ *
+ * Example string format: "bibliography/html=http://www.zotero.org/styles/apa"
+ *
+ * Quick Copy setting object has the following properties:
+ * - "mode": "bibliography" (for styles) or "export" (for export translators)
+ * - "contentType: "" (plain text output) or "html" (HTML output; for styles
+ * only)
+ * - "id": style ID or export translator ID
+ * - "locale": locale code (for styles only)
+ */
+ this.unserializeSetting = function (setting) {
+ var settingObject = {};
+
+ if (typeof setting === 'string') {
+ try {
+ // First test if string input is a stringified object
+ settingObject = JSON.parse(setting);
+ } catch (e) {
+ // Try parsing as formatted string
+ var parsedSetting = setting.match(/(bibliography|export)(?:\/([^=]+))?=(.+)$/);
+ if (parsedSetting) {
+ settingObject.mode = parsedSetting[1];
+ settingObject.contentType = parsedSetting[2] || '';
+ settingObject.id = parsedSetting[3];
+ settingObject.locale = '';
+ }
+ }
+ } else {
+ // Return input if not a string; it might already be an object
+ return setting;
+ }
+
+ return settingObject;
+ };
+
+
this.getFormattedNameFromSetting = Zotero.Promise.coroutine(function* (setting) {
if (!_formattedNames) {
yield _loadFormattedNames();
}
- var name = _formattedNames[this.stripContentType(setting)];
+ var format = this.unserializeSetting(setting);
+
+ var name = _formattedNames[format.mode + "=" + format.id];
return name ? name : '';
});
@@ -67,61 +103,48 @@ Zotero.QuickCopy = new function() {
});
- /*
- * Returns the setting with any contentType stripped from the mode part
- */
- function getContentType(setting) {
- var matches = setting.match(/(?:bibliography|export)\/([^=]+)=.+$/, '$1');
- return matches ? matches[1] : '';
- }
-
-
- /*
- * Returns the setting with any contentType stripped from the mode part
- */
- function stripContentType(setting) {
- return setting.replace(/(bibliography|export)(?:\/[^=]+)?=(.+)$/, '$1=$2');
- }
-
-
- this.getFormatFromURL = function (url) {
+ this.getFormatFromURL = function(url) {
+ var quickCopyPref = Zotero.Prefs.get("export.quickCopy.setting");
+ quickCopyPref = JSON.stringify(this.unserializeSetting(quickCopyPref));
+
if (!url) {
- return Zotero.Prefs.get("export.quickCopy.setting");
+ return quickCopyPref;
}
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService);
- var nsIURI = ioService.newURI(url, null, null);
-
try {
+ var nsIURI = ioService.newURI(url, null, null);
+ // Accessing some properties may throw for URIs that do not support those
+ // parts. E.g. hostPort throws NS_ERROR_FAILURE for about:blank
var urlHostPort = nsIURI.hostPort;
var urlPath = nsIURI.path;
}
catch (e) {
- return Zotero.Prefs.get("export.quickCopy.setting");
+ return quickCopyPref;
}
if (!_siteSettings) {
throw new Zotero.Exception.UnloadedDataException("Quick Copy site settings not loaded");
}
- var urlDomain = urlHostPort.match(/[^\.]+\.[^\.]+$/);
var matches = [];
+ var urlDomain = urlHostPort.match(/[^\.]+\.[^\.]+$/);
for (let i=0; i<_siteSettings.length; i++) {
let row = _siteSettings[i];
// Only concern ourselves with entries containing the current domain
// or paths that apply to all domains
- if (!row.domainPath.contains(urlDomain) && !row.domainPath.startsWith('/')) {
+ if (!row.domainPath.contains(urlDomain[0]) && !row.domainPath.startsWith('/')) {
continue;
}
- var [domain, path] = row.domainPath.split(/\//);
- path = '/' + (path ? path : '');
- var re = new RegExp(domain + '$');
- if (urlHostPort.match(re) && urlPath.indexOf(path) == 0) {
+ let domain = row.domainPath.split('/',1)[0];
+ let path = row.domainPath.substr(domain.length) || '/';
+ let re = new RegExp('(^|[./])' + Zotero.Utilities.quotemeta(domain) + '$', 'i');
+ if (re.test(urlHostPort) && urlPath.indexOf(path) === 0) {
matches.push({
- format: row.format,
+ format: JSON.stringify(this.unserializeSetting(row.format)),
domainLength: domain.length,
pathLength: path.length
});
@@ -145,14 +168,14 @@ Zotero.QuickCopy = new function() {
}
return -1;
- }
+ };
if (matches.length) {
matches.sort(sort);
return matches[0].format;
+ } else {
+ return quickCopyPref;
}
-
- return Zotero.Prefs.get("export.quickCopy.setting");
};
@@ -161,8 +184,9 @@ Zotero.QuickCopy = new function() {
*
* |items| is an array of Zotero.Item objects
*
- * |format| is a Quick Copy format string
- * (e.g. "bibliography=http://purl.org/net/xbiblio/csl/styles/apa.csl")
+ * |format| may be a Quick Copy format string
+ * (e.g. "bibliography=http://www.zotero.org/styles/apa")
+ * or an Quick Copy format object
*
* |callback| is only necessary if using an export format and should be
* a function suitable for Zotero.Translate.setHandler, taking parameters
@@ -172,25 +196,24 @@ Zotero.QuickCopy = new function() {
* If bibliography format, the process is synchronous and an object
* contain properties 'text' and 'html' is returned.
*/
- function getContentFromItems(items, format, callback, modified) {
+ this.getContentFromItems = function (items, format, callback, modified) {
if (items.length > Zotero.Prefs.get('export.quickCopy.dragLimit')) {
Zotero.debug("Skipping quick copy for " + items.length + " items");
return false;
}
- var [mode, format] = format.split('=');
- var [mode, contentType] = mode.split('/');
+ format = this.unserializeSetting(format);
- if (mode == 'export') {
+ if (format.mode == 'export') {
var translation = new Zotero.Translate.Export;
translation.noWait = true; // needed not to break drags
translation.setItems(items);
- translation.setTranslator(format);
+ translation.setTranslator(format.id);
translation.setHandler("done", callback);
translation.translate();
return true;
}
- else if (mode == 'bibliography') {
+ else if (format.mode == 'bibliography') {
// Move notes to separate array
var allNotes = true;
var notes = [];
@@ -335,32 +358,35 @@ Zotero.QuickCopy = new function() {
}
var content = {
- text: contentType == "html" ? html : text,
+ text: format.contentType == "html" ? html : text,
html: copyHTML
};
return content;
}
+ // determine locale preference
+ var locale = format.locale ? format.locale : Zotero.Prefs.get('export.quickCopy.locale');
+
// Copy citations if shift key pressed
if (modified) {
- var csl = Zotero.Styles.get(format).getCiteProc();
+ var csl = Zotero.Styles.get(format.id).getCiteProc(locale);
csl.updateItems([item.id for each(item in items)]);
var citation = {citationItems:[{id:item.id} for each(item in items)], properties:{}};
var html = csl.previewCitationCluster(citation, [], [], "html");
var text = csl.previewCitationCluster(citation, [], [], "text");
} else {
- var style = Zotero.Styles.get(format);
- var cslEngine = style.getCiteProc();
+ var style = Zotero.Styles.get(format.id);
+ var cslEngine = style.getCiteProc(locale);
var html = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, items, "html");
var text = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, items, "text");
}
- return {text:(contentType == "html" ? html : text), html:html};
+ return {text:(format.contentType == "html" ? html : text), html:html};
}
- throw ("Invalid mode '" + mode + "' in Zotero.QuickCopy.getContentFromItems()");
- }
+ throw ("Invalid mode '" + format.mode + "' in Zotero.QuickCopy.getContentFromItems()");
+ };
var _loadFormattedNames = Zotero.Promise.coroutine(function* () {
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index c091cec7f..8cd885698 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -1035,7 +1035,7 @@ Zotero.Schema = new function(){
}
// Send list of installed styles
- var styles = yield Zotero.Styles.getAll();
+ var styles = Zotero.Styles.getAll();
var styleTimestamps = [];
for (var id in styles) {
var updated = Zotero.Date.sqlToDate(styles[id].updated);
diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index 0abab9ed8..bbaac8c1c 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -1348,6 +1348,10 @@ Zotero.Sync.Storage = new function () {
if (!file) {
throw ("Empty path for item " + item.key + " in " + funcName);
}
+ // Don't save Windows aliases
+ if (file.leafName.endsWith('.lnk')) {
+ return false;
+ }
var fileName = file.leafName;
var renamed = false;
@@ -1758,8 +1762,9 @@ Zotero.Sync.Storage = new function () {
params.push(Zotero.Sync.Storage.SYNC_STATE_TO_DOWNLOAD);
}
sql += ") "
- // Skip attachments with empty path, which can't be saved
- + "AND path!=''";
+ // Skip attachments with empty path, which can't be saved, and files with .zotero*
+ // paths, which have somehow ended up in some users' libraries
+ + "AND path!='' AND path NOT LIKE 'storage:.zotero%'";
var itemIDs = Zotero.DB.columnQuery(sql, params);
if (!itemIDs) {
return [];
diff --git a/chrome/content/zotero/xpcom/style.js b/chrome/content/zotero/xpcom/style.js
index 095711acf..336a8e029 100644
--- a/chrome/content/zotero/xpcom/style.js
+++ b/chrome/content/zotero/xpcom/style.js
@@ -51,6 +51,14 @@ Zotero.Styles = new function() {
var start = new Date;
_initialized = true;
+ // Upgrade style locale prefs for 4.0.27
+ var bibliographyLocale = Zotero.Prefs.get("export.bibliographyLocale");
+ if (bibliographyLocale) {
+ Zotero.Prefs.set("export.lastLocale", bibliographyLocale);
+ Zotero.Prefs.set("export.quickCopy.locale", bibliographyLocale);
+ Zotero.Prefs.clear("export.bibliographyLocale");
+ }
+
_styles = {};
_visibleStyles = [];
this.lastCSL = null;
@@ -65,8 +73,33 @@ Zotero.Styles = new function() {
num += yield _readStylesFromDirectory(hiddenDir, true);
}
+ // Sort visible styles by title
+ _visibleStyles.sort(function(a, b) {
+ return a.title.localeCompare(b.title);
+ })
+ // .. and freeze, so they can be returned directly
+ _visibleStyles = Object.freeze(_visibleStyles);
+
Zotero.debug("Cached " + num + " styles in " + (new Date - start) + " ms");
+ // load available CSL locales
+ var localeFile = {};
+ var locales = {};
+ var primaryDialects = {};
+ var localesLocation = "chrome://zotero/content/locale/csl/locales.json";
+ localeFile = JSON.parse(yield Zotero.File.getContentsFromURLAsync(localesLocation));
+
+ primaryDialects = localeFile["primary-dialects"];
+
+ // only keep localized language name
+ for (let locale in localeFile["language-names"]) {
+ locales[locale] = localeFile["language-names"][locale][0];
+ }
+
+ this.locales = locales;
+ this.primaryDialects = primaryDialects;
+
+ // Load renamed styles
_renamedStyles = {};
yield Zotero.HTTP.request(
"GET",
@@ -161,24 +194,25 @@ Zotero.Styles = new function() {
/**
* Gets all visible styles
- * @return {Promise} A promise for an array of Zotero.Style objects
+ * @return {Zotero.Style[]} - An immutable array of Zotero.Style objects
*/
this.getVisible = function () {
- return this.init().then(function () {
- return _visibleStyles.slice(0);
- });
+ if (!_initialized) {
+ throw new Zotero.Exception.UnloadedDataException("Styles not yet loaded", 'styles');
+ }
+ return _visibleStyles; // Immutable
}
/**
* Gets all styles
*
- * @return {Promise} A promise for an object with style IDs for keys and
- * Zotero.Style objects for values
+ * @return {Object} - An object with style IDs for keys and Zotero.Style objects for values
*/
this.getAll = function () {
- return this.init().then(function () {
- return _styles;
- });
+ if (!_initialized) {
+ throw new Zotero.Exception.UnloadedDataException("Styles not yet loaded", 'styles');
+ }
+ return _styles;
}
/**
@@ -313,7 +347,7 @@ Zotero.Styles = new function() {
// also look for an existing style with the same title
if(!existingFile) {
- let styles = yield Zotero.Styles.getAll();
+ let styles = Zotero.Styles.getAll();
for (let i in styles) {
let existingStyle = styles[i];
if(title === existingStyle.title) {
@@ -415,6 +449,104 @@ Zotero.Styles = new function() {
}
}
});
+
+ /**
+ * Populate menulist with locales
+ *
+ * @param {xul:menulist} menulist
+ * @return {Promise}
+ */
+ this.populateLocaleList = function (menulist) {
+ if (!_initialized) {
+ throw new Zotero.Exception.UnloadedDataException("Styles not yet loaded", 'styles');
+ }
+
+ // Reset menulist
+ menulist.selectedItem = null;
+ menulist.removeAllItems();
+
+ let fallbackLocale = Zotero.Styles.primaryDialects[Zotero.locale]
+ || Zotero.locale;
+
+ let menuLocales = Zotero.Utilities.deepCopy(Zotero.Styles.locales);
+ let menuLocalesKeys = Object.keys(menuLocales).sort();
+
+ // Make sure that client locale is always available as a choice
+ if (fallbackLocale && !(fallbackLocale in menuLocales)) {
+ menuLocales[fallbackLocale] = fallbackLocale;
+ menuLocalesKeys.unshift(fallbackLocale);
+ }
+
+ for (let i=0; i <ZOTEROBREAK/> => <br/>
- * <ZOTEROHELLIP/> => …
- * @type String
+ * Encode special XML/HTML characters
+ * Certain entities can be inserted manually:
+ *
{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
31.0
- 37.*
+ 39.*
diff --git a/resource/schema/renamed-styles.json b/resource/schema/renamed-styles.json
index 171acf5b1..af124b317 100644
--- a/resource/schema/renamed-styles.json
+++ b/resource/schema/renamed-styles.json
@@ -1,6 +1,8 @@
{
"aaa": "american-anthropological-association",
+ "acta-theriologica": "mammal-research",
"advances-physiology-education": "advances-in-physiology-education",
+ "aegean-review-of-the-law-of-the-sea-and-maritime-law": "springer-basic-author-date",
"agriculture-ecosystems-environment": "agriculture-ecosystems-and-environment",
"ajp-heart-circulatory-physiology": "ajp-heart-and-circulatory-physiology",
"ajp-regulatory-integrative-comparative-physiology": "ajp-regulatory-integrative-and-comparative-physiology",
@@ -39,6 +41,7 @@
"brain-and-development-english-language": "brain-and-development",
"british-journal-of-medical-economics": "journal-of-medical-economics",
"british-volume-of-the-journal-of-bone-and-joint-surgery": "the-journal-of-bone-and-joint-surgery",
+ "bulletin-of-materials-science": "springer-humanities-author-date",
"bulletin-of-the-medical-library-association": "journal-of-the-medical-library-association",
"canadian-journal-of-anaesthesia": "canadian-journal-of-anesthesia",
"canadian-journal-of-behavioral-science": "canadian-journal-of-behavioural-science",
@@ -55,9 +58,12 @@
"chicago-note": "chicago-note-bibliography",
"chronic-diseases-in-canada": "chronic-diseases-and-injuries-in-canada",
"college-of-physicians-and-surgeons-pakistan": "journal-of-the-college-of-physicians-and-surgeons-pakistan",
+ "combination-products-in-therapy": "springer-vancouver-brackets",
"comparative-effectiveness-research": "journal-of-comparative-effectiveness-research",
"comparative-hepatology": "biomed-central",
+ "criminal-law-and-philosophy": "springer-socpsych-author-date",
"cuadernos-filologia-clasica": "cuadernos-de-filologia-clasica",
+ "current-hepatitis-reports": "current-hepatology-reports",
"current-opinion-biotechnology": "current-opinion-in-biotechnology",
"current-opinion-cell-biology": "current-opinion-in-cell-biology",
"current-opinion-chemical-biology": "current-opinion-in-chemical-biology",
@@ -69,6 +75,8 @@
"current-opinion-pharmacology": "current-opinion-in-pharmacology",
"current-opinion-plant-biology": "current-opinion-in-plant-biology",
"current-opinion-structural-biology": "current-opinion-in-structural-biology",
+ "current-respiratory-care-reports": "current-pulmonology-reports",
+ "current-translational-geriatrics-and-gerontology-reports": "current-geriatrics-reports",
"danish-dental-journal": "tandlaegebladet",
"danish-medical-bulletin": "danish-medical-journal",
"diabetes-vascular-disease-research": "diabetes-and-vascular-disease-research",
@@ -76,6 +84,7 @@
"diseases-aquatic-organisms": "diseases-of-aquatic-organisms",
"edizioni-minerva-medica": "minerva-medica",
"ethics-science-environmental-politics": "ethics-in-science-and-environmental-politics",
+ "european-journal-of-population-revue-europeenne-de-demographie": "european-journal-of-population",
"f1000-research": "f1000research",
"febs-journal": "the-febs-journal",
"fems": "federation-of-european-microbiological-societies",
@@ -256,6 +265,7 @@
"genetic-vaccines-and-therapy": "biomed-central",
"geological-society-america-bulletin": "geological-society-of-america-bulletin",
"geological-society-of-america": "the-geological-society-of-america",
+ "giornale-italiano-di-health-technology-assessment": "springer-vancouver-brackets",
"gost-r-7-0-5-2008-csl-1-0": "gost-r-7-0-5-2008",
"graefes-archive-and-experimental-ophthalmology": "graefes-archive-for-clinical-and-experimental-ophthalmology",
"harvard-anglia-ruskin": "harvard-anglia-ruskin-university",
@@ -275,33 +285,49 @@
"hwr-berlin": "hochschule-fur-wirtschaft-und-recht-berlin",
"ices-jms": "ices-journal-of-marine-science",
"ieee-w-url": "ieee-with-url",
+ "indian-journal-of-virology": "virusdisease",
+ "information-retrieval": "information-retrieval-journal",
"institute-of-electronics-information-and-communication-engineers": "the-institute-of-electronics-information-and-communication-engineers",
"integrative-omics-and-molecular-biology": "biomed-central",
"international-archives-of-allergy-and-applied-immunology": "international-archives-of-allergy-and-immunology",
"international-journal-cross-cultural-management": "international-journal-of-cross-cultural-management",
+ "international-journal-of-euro-mediterranean-studies": "springer-basic-author-date",
+ "international-journal-of-health-care-finance-and-economics": "international-journal-of-health-economics-and-management",
"international-journal-of-psychiatry-in-medicine": "the-international-journal-of-psychiatry-in-medicine",
"international-journal-of-psychoanalysis": "the-international-journal-of-psychoanalysis",
+ "international-journal-of-the-classical-tradition": "springer-humanities-brackets",
"international-journal-of-tropical-biology-and-conservation": "revista-de-biologia-tropical",
"iranian-journal-of-environmental-health-science-and-engineering": "biomed-central",
"iso690-author-date-fr-without-abstract": "iso690-author-date-fr-no-abstract",
+ "jahrbuch-fur-regionalwissenschaft": "review-of-regional-research",
"jid-symposium-proceedings": "journal-of-investigative-dermatology-symposium-proceedings",
+ "journal-fur-betriebswirtschaft": "management-review-quarterly",
"journal-of-aapos": "journal-of-american-association-for-pediatric-ophthalmology-and-strabismus",
"journal-of-allergy-and-clinical-immunology": "the-journal-of-allergy-and-clinical-immunology",
+ "journal-of-astrophysics-and-astronomy": "springer-humanities-author-date",
+ "journal-of-bioethical-inquiry": "springer-humanities-author-date",
+ "journal-of-biorheology": "springer-vancouver-brackets",
"journal-of-bioscience-and-medicine": "biomed-central",
"journal-of-bone-and-joint-surgery": "the-journal-of-bone-and-joint-surgery",
"journal-of-cardiovascular-surgery": "the-journal-of-cardiovascular-surgery",
"journal-of-cell-biology": "the-journal-of-cell-biology",
"journal-of-chemical-physics": "the-journal-of-chemical-physics",
+ "journal-of-chemical-sciences": "springer-humanities-brackets",
"journal-of-circadian-rhythms": "biomed-central",
"journal-of-clinical-endocrinology-and-metabolism": "the-journal-of-clinical-endocrinology-and-metabolism",
"journal-of-clinical-investigation": "the-journal-of-clinical-investigation",
"journal-of-clinical-psychiatry": "the-journal-of-clinical-psychiatry",
+ "journal-of-earth-system-science": "springer-humanities-author-date",
"journal-of-experimental-medicine": "the-journal-of-experimental-medicine",
"journal-of-experimental-psychology-animal-behavior-processes": "journal-of-experimental-psychology-animal-learning-and-cognition",
"journal-of-general-physiology": "the-journal-of-general-physiology",
+ "journal-of-genetics": "springer-humanities-author-date",
+ "journal-of-geometric-analysis": "springer-mathphys-brackets",
+ "journal-of-global-policy-and-governance": "springer-basic-author-date",
"journal-of-hand-surgery": "the-journal-of-hand-surgery",
"journal-of-heart-and-lung-transplantation": "the-journal-of-heart-and-lung-transplantation",
"journal-of-hellenic-studies": "the-journal-of-hellenic-studies",
+ "journal-of-hepato-biliary-pancreatic-sciences": "springer-vancouver-brackets",
"journal-of-hong-kong-medical-association": "hong-kong-medical-journal",
"journal-of-indian-prosthodontic-society": "the-journal-of-indian-prosthodontic-society",
"journal-of-juristic-papyrology": "the-journal-of-juristic-papyrology",
@@ -315,6 +341,7 @@
"journal-of-pharmacy-technology": "the-journal-of-pharmacy-technology",
"journal-of-physical-chemistry": "the-journal-of-physical-chemistry-a",
"journal-of-prosthetic-dentistry": "the-journal-of-prosthetic-dentistry",
+ "journal-of-science-teacher-education": "springer-socpsych-author-date",
"journal-of-the-american-academy-of-physician-assistants": "jaapa",
"journal-of-the-american-dental-association": "the-journal-of-the-american-dental-association",
"journal-of-the-american-medical-association": "jama",
@@ -354,11 +381,13 @@
"mla-underline": "modern-language-association-underline",
"mla-url": "modern-language-association-with-url",
"modern-language-association-note": "modern-language-association-6th-edition-note",
+ "modern-rheumatology": "springer-vancouver-brackets",
"molecular-biochemical-parasitology": "molecular-and-biochemical-parasitology",
"national-library-of-medicine-grant": "national-library-of-medicine-grant-proposals",
"natural-product-updates": "royal-society-of-chemistry",
"nature-neuroscience-brief-communication": "nature-neuroscience-brief-communications",
"natureza-e-conservacao": "natureza-and-conservacao",
+ "naturwissenschaften": "the-science-of-nature",
"netherlands-journal-of-medicine": "the-netherlands-journal-of-medicine",
"neumologica-y-cirugia-de-torax-neurofibromatosis": "neumologia-y-cirugia-de-torax",
"neural-systems-and-circuits": "biomed-central",
@@ -366,6 +395,7 @@
"new-iraqi-journal-of-medicine": "the-new-iraqi-journal-of-medicine",
"new-zealand-journal-of-medical-laboratory-technology": "new-zealand-journal-of-medical-laboratory-science",
"new-zealand-medical-journal": "the-new-zealand-medical-journal",
+ "nexus-network-journal": "springer-humanities-author-date",
"nlm": "national-library-of-medicine",
"nonlinear-biomedical-physics": "biomed-central",
"north-west-university-harvard": "harvard-north-west-university",
@@ -375,10 +405,13 @@
"oxford-brookes-university-faculty-of-health-and-life-sciences": "harvard-oxford-brookes-university-faculty-of-health-and-life-sciences",
"oxford-university-new-south-wales": "oxford-the-university-of-new-south-wales",
"pedobiologia-international-journal-of-soil-biology": "pedobiologia-journal-of-soil-ecology",
+ "pharmacoeconomics-german-research-articles": "springer-vancouver-brackets",
"physiological-biochemical-zoology": "physiological-and-biochemical-zoology",
"plant-cell": "the-plant-cell",
"polish-botanical-society": "acta-societatis-botanicorum-poloniae",
"polski-przegld-otorynolaryngologiczny": "polski-przeglad-otorynolaryngologiczny",
+ "pramana": "springer-physics-brackets",
+ "proceedings-mathematical-sciences": "springer-mathphys-brackets",
"progrcs-en-urologie": "progres-en-urologie",
"progrcs-en-urologie-fmc": "progres-en-urologie",
"quaderni-avogadro-colloquia": "quaderni-degli-avogadro-colloquia",
@@ -386,9 +419,11 @@
"review-of-financial-studies": "the-review-of-financial-studies",
"revista-brasileira-de-botanica": "brazilian-journal-of-botany",
"rockefeller-university-press": "the-rockefeller-university-press",
+ "sadhana": "springer-humanities-author-date",
"sbl-fullnote-bibliography": "society-of-biblical-literature-fullnote-bibliography",
"scandinavian-journal-of-clinical-and-laboratory-investigation": "the-scandinavian-journal-of-clinical-and-laboratory-investigation",
"science-without-title": "science-without-titles",
+ "sensing-and-imaging-an-international-journal": "sensing-and-imaging",
"silence": "biomed-central",
"small-wiley": "small",
"smartt": "biomed-central",
@@ -402,9 +437,11 @@
"tah-gkw": "geistes-und-kulturwissenschaften-teilmann",
"tah-soz": "sozialwissenschaften-teilmann",
"taylor-and-francis-reference-style-f": "taylor-and-francis-chicago-f",
+ "technology-operation-management": "springer-humanities-author-date",
"the-academy-of-management-review": "academy-of-management-review",
"the-american-journal-of-emergency-medicine": "american-journal-of-emergency-medicine",
"tort-law-review": "the-tort-law-review",
+ "transition-studies-review": "springer-basic-author-date",
"trends-journal": "trends-journals",
"tu-wien-dissertation": "technische-universitat-wien",
"ulster-medical-journal": "the-ulster-medical-journal",
@@ -419,6 +456,7 @@
"uqam-universite-du-quebec-a-montreal": "universite-du-quebec-a-montreal",
"user-modeling-and-useradapted-interaction": "user-modeling-and-user-adapted-interaction",
"wceam2010": "world-congress-on-engineering-asset-management",
+ "wirtschaftsinformatik": "springer-basic-author-date",
"world-health-organization-journals": "world-health-organization",
"world-journal-of-biological-psychiatry": "the-world-journal-of-biological-psychiatry"
}
diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt
index 218dc6b96..a127a3a95 100644
--- a/resource/schema/repotime.txt
+++ b/resource/schema/repotime.txt
@@ -1 +1 @@
-2015-02-11 04:00:00
+2015-06-25 14:05:00
diff --git a/styles b/styles
index 188e5914c..5a9216bcb 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit 188e5914c723d4c98596ac58cdf736c291ba4f4f
+Subproject commit 5a9216bcb31d45bd8a7f8245a40159005fd59211
diff --git a/test/resource/chai b/test/resource/chai
index 8eab1e5f1..775281e13 160000
--- a/test/resource/chai
+++ b/test/resource/chai
@@ -1 +1 @@
-Subproject commit 8eab1e5f194e186a020b5abf2cd0e409e53222a2
+Subproject commit 775281e138df26101fba1e554c516f47438851b5
diff --git a/test/resource/mocha b/test/resource/mocha
index 65fc80ecd..44b004546 160000
--- a/test/resource/mocha
+++ b/test/resource/mocha
@@ -1 +1 @@
-Subproject commit 65fc80ecd96ca2159a792aff089bbc273d4bd86d
+Subproject commit 44b0045463907b1d7963a2e9560c24d9552aac5d
diff --git a/translators b/translators
index daa1a0593..e12d185b3 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit daa1a05939295c76d12dfefe2c675ac9fcb43806
+Subproject commit e12d185b3418188a3f1221b5f87c33a1720c073c
diff --git a/update.rdf b/update.rdf
index 5f361368e..a1e49c7f9 100644
--- a/update.rdf
+++ b/update.rdf
@@ -12,7 +12,7 @@
{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
31.0
- 37.*
+ 39.*
http://download.zotero.org/extension/zotero.xpi
sha1: