www

commit a12b997b8a4021c90cf60e164dd394fcbb992706
parent 8d3e893aecc5523bf98c0c233049d449a1ec7fb5
Author: Adomas Venčkauskas <adomas.ven@gmail.com>
Date:   Mon, 19 Mar 2018 11:36:53 +0200

Fix corrupt citation prompt going into recursive loop

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

1 file changed, 28 insertions(+), 37 deletions(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -2211,31 +2211,24 @@ Zotero.Integration.CitationField = class extends Zotero.Integration.Field {
 	}
 		
 	resolveCorrupt(code) {
-		return Zotero.Promise.coroutine(function* () {
-			Zotero.debug(`Integration: handling corrupt citation field ${code}`);
-			var msg = Zotero.getString("integration.corruptField")+'\n\n'+
-					  Zotero.getString('integration.corruptField.description');
-			this.select();
-			Zotero.Integration.currentDoc.activate();
-			var result = Zotero.Integration.currentSession.displayAlert(msg, DIALOG_ICON_CAUTION, DIALOG_BUTTONS_YES_NO_CANCEL);
-			if (result == 0) { // Cancel
-				return new Zotero.Exception.UserCancelled("corrupt citation resolution");
-			} else if (result == 1) {		// No
-				return false;
-			} else { // Yes
-				var fieldGetter = Zotero.Integration.currentSession.fields,
-					oldWindow = Zotero.Integration.currentWindow,
-					oldProgressCallback = this.progressCallback;
-				// Display reselect edit citation dialog
-				let [idx, field, citation] = yield fieldGetter.addEditCitation(this);
-				if (Zotero.Integration.currentWindow && !Zotero.Integration.currentWindow.closed) {
-					Zotero.Integration.currentWindow.close();
-				}
-				Zotero.Integration.currentWindow = oldWindow;
-				fieldGetter.progressCallback = oldProgressCallback;
-				return citation;
-			}	
-		}).apply(this, arguments);
+		Zotero.debug(`Integration: handling corrupt citation field ${code}`);
+		var msg = Zotero.getString("integration.corruptField")+'\n\n'+
+				  Zotero.getString('integration.corruptField.description');
+		this.select();
+		Zotero.Integration.currentDoc.activate();
+		var result = Zotero.Integration.currentSession.displayAlert(msg, DIALOG_ICON_CAUTION, DIALOG_BUTTONS_YES_NO_CANCEL);
+		if (result == 0) { // Cancel
+			return new Zotero.Exception.UserCancelled("corrupt citation resolution");
+		} else if (result == 1) {		// No
+			return false;
+		} else { // Yes
+			var fieldGetter = Zotero.Integration.currentSession.fields,
+				oldWindow = Zotero.Integration.currentWindow,
+				oldProgressCallback = this.progressCallback;
+			// Clear current code and subsequent addEditCitation dialog will be the reselection
+			this.clearCode();
+			return this.unserialize();
+		}
 	}
 };
 
@@ -2256,18 +2249,16 @@ Zotero.Integration.BibliographyField = class extends Zotero.Integration.Field {
 	}
 			
 	resolveCorrupt(code) {
-		return Zotero.Promise.coroutine(function* () {
-			Zotero.debug(`Integration: handling corrupt bibliography field ${code}`);
-			var msg = Zotero.getString("integration.corruptBibliography")+'\n\n'+
-					  Zotero.getString('integration.corruptBibliography.description');
-			var result = Zotero.Integration.currentSession.displayAlert(msg, DIALOG_ICON_CAUTION, DIALOG_BUTTONS_OK_CANCEL);
-			if (result == 0) {
-				throw new Zotero.Exception.UserCancelled("corrupt bibliography resolution");
-			} else {
-				this.clearCode();
-				return unserialize();
-			}
-		}).apply(this, arguments);
+		Zotero.debug(`Integration: handling corrupt bibliography field ${code}`);
+		var msg = Zotero.getString("integration.corruptBibliography")+'\n\n'+
+				  Zotero.getString('integration.corruptBibliography.description');
+		var result = Zotero.Integration.currentSession.displayAlert(msg, DIALOG_ICON_CAUTION, DIALOG_BUTTONS_OK_CANCEL);
+		if (result == 0) {
+			throw new Zotero.Exception.UserCancelled("corrupt bibliography resolution");
+		} else {
+			this.clearCode();
+			return unserialize();
+		}
 	}
 };