From 64f810dd5a00e327ccca60ed8f3bb7dc9fdb74ec Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Mon, 16 Aug 2010 08:46:07 +0000
Subject: [PATCH] fix issues inserting new citations with locators with
 accented characters (citations will still need to be reinserted)

---
 .../zotero/integration/addCitationDialog.js   | 11 +++--
 chrome/content/zotero/xpcom/integration.js    | 41 +++++--------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/chrome/content/zotero/integration/addCitationDialog.js b/chrome/content/zotero/integration/addCitationDialog.js
index 8af44386e3..d0884eac67 100644
--- a/chrome/content/zotero/integration/addCitationDialog.js
+++ b/chrome/content/zotero/integration/addCitationDialog.js
@@ -125,7 +125,8 @@ var Zotero_Citation_Dialog = new function () {
 				_suppressNextTreeSelect = true;
 				
 				// switch to library if item doesn't exist in current selection
-				if(collectionsView.getSelectedCollection() && !collectionsView.getSelectedCollection().hasItem(io.citation.citationItems[0].id)) { 
+				var collection = collectionsView.getSelectedCollection();
+				if(collection && !collection.hasItem(io.citation.citationItems[0].id)) { 
 					var item = Zotero.Items.get(io.citation.citationItems[0].id);
 					collectionsView.selectLibrary(item.libraryID);
 				}
@@ -709,12 +710,14 @@ var Zotero_Citation_Dialog = new function () {
 					if(box == "label") {
 						citationItem[box] = _locatorNameArray[document.getElementById(box).selectedIndex];
 					} else {
-						citationItem[box] = document.getElementById(box)[property];
+						var prop = document.getElementById(box)[property];
+						if(prop !== "" && prop !== false) citationItem[box] = prop;
 					}
 				}
 				
-				if(citationItem["locator"] == "") {
-					citationItem["locator"] = citationItem["label"] = undefined;
+				if(!citationItem["locator"]) {
+					delete citationItem["locator"];
+					delete citationItem["label"];
 				}
 				
 				io.citation.citationItems = [citationItem];
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index c75fcc0ae1..f00b52bfd1 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -1048,45 +1048,26 @@ Zotero.Integration.Session.prototype.reselectItem = function(exception) {
 /**
  * Generates a field from a citation object
  */
-Zotero.Integration.Session._acceptableTypes = ["string", "boolean", "number"];
-Zotero.Integration.Session._saveProperties = ["custom", "unsorted"];
-Zotero.Integration.Session._saveItems = ["locator", "label", "suppress-author", "author-only", "prefix", "suffix"];
 Zotero.Integration.Session.prototype.getCitationField = function(citation) {
+	const saveProperties = ["custom", "unsorted"];
+	const saveCitationItems = ["locator", "label", "suppress-author", "author-only", "prefix", "suffix", "uri"];
+	
 	var type;
 	var field = [];
 	
 	field.push('"citationID":'+uneval(citation.citationID));
-	var properties = [];
-	for(var j=0; j<Zotero.Integration.Session._saveProperties.length; j++) {
-		var property = Zotero.Integration.Session._saveProperties[j];
-		if(citation.properties[property] || citation.properties[property] === false) {
-			let propval = typeof citation.properties[property] == "object" ? 
-					Zotero.JSON.serialize(citation.properties[property]) :
-					uneval(citation.properties[property]);
-			properties.push('"'+property+'":'+propval);
-		}
+	
+	var properties = JSON.stringify(citation.properties, saveProperties);
+	if(properties != "{}") {
+		field.push('"properties":{'+properties+"}");
 	}
-	if(properties.length) field.push('"properties":{'+properties.join(",")+"}");
-
+	
 	var citationItems = [];
 	for(var j=0; j<citation.citationItems.length; j++) {
-		var citationItem = [];
+		var citationItem = citation.citationItems[j];
 		
-		// save citationItem properties
-		for(var k in citation.citationItems[j]) {
-			type = typeof(citation.citationItems[j][k]);
-			if(citation.citationItems[j][k] && Zotero.Integration.Session._saveItems.indexOf(k) !== -1
-			    && Zotero.Integration.Session._acceptableTypes.indexOf(type) !== -1) {
-			    let propval = typeof citation.citationItems[j][k] == "object" ?
-			    		Zotero.JSON.serialize(citation.citationItems[j][k]) :
-			    		uneval(citation.citationItems[j][k]);
-				citationItem.push('"'+k+'":'+propval);
-			}
-		}
-		
-		// save URI
-		citationItem.push('"uri":'+Zotero.JSON.serialize(this.uriMap.getURIsForItemID(citation.citationItems[j].id)));
-		citationItems.push("{"+citationItem.join(",")+"}");
+		citationItem.uri = this.uriMap.getURIsForItemID(citation.citationItems[j].id);
+		citationItems.push(JSON.stringify(citationItem, saveCitationItems));
 	}
 	field.push('"citationItems":['+citationItems.join(",")+"]");