merge r7225 to trunk

This commit is contained in:
Simon Kornblith 2010-10-31 05:19:43 +00:00
parent 2f5fc456c7
commit 8207201c6a

View file

@ -234,7 +234,7 @@ Zotero.Integration = new function() {
// service // service
try { try {
var componentClass = "@zotero.org/Zotero/integration/application?agent="+agent+";1"; var componentClass = "@zotero.org/Zotero/integration/application?agent="+agent+";1";
Zotero.debug("Integration: Instantiating "+componentClass+" for command "+command); Zotero.debug("Integration: Instantiating "+componentClass+" for command "+command+(docId ? " with doc "+docId : ""));
var application = Components.classes[componentClass] var application = Components.classes[componentClass]
.getService(Components.interfaces.zoteroIntegrationApplication); .getService(Components.interfaces.zoteroIntegrationApplication);
} catch(e) { } catch(e) {
@ -1113,7 +1113,7 @@ Zotero.Integration.Session.prototype.getCitationField = function(citation) {
var properties = JSON.stringify(citation.properties, saveProperties); var properties = JSON.stringify(citation.properties, saveProperties);
if(properties != "{}") { if(properties != "{}") {
field.push('"properties":'+properties); field.push('"properties":{'+properties+"}");
} }
var citationItems = []; var citationItems = [];