www

commit 6a3ce4292e0cdc81cceef63a1faf0ad151fa37fc
parent 0daf51e05c9ca208b07d8639b0e589eb63b877da
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed,  8 Feb 2012 16:40:02 -0500

Don't display an error if adding a citation is cancelled

Diffstat:
M
chrome/content/zotero/xpcom/integration.js
 | 
4
+---

1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -1067,9 +1067,6 @@ Zotero.Integration.Document.prototype.setDocPrefs = function() {
 								// pass to conversion function
 								me._doc.convert(new Zotero.Integration.Document.JSEnumerator(fieldsToConvert),
 									me._session.data.prefs.fieldType, fieldNoteTypes, fieldNoteTypes.length);
-								
-								// clear fields so that they will get collected again before refresh
-								me._fields = undefined;
 							}
 							
 							// refresh contents
@@ -1656,6 +1653,7 @@ Zotero.Integration.Fields.prototype.addEditCitation = function(field, callback) 
 	} else {
 		newField = true;
 		var field = this.addField(true);
+		if(!field) return;
 	}
 	
 	if(!citation) {