www

commit 117ce8408bba674dec48aece1c9404779f79c88a
parent bfb945d7055a34f1d172ea0c3fde3ae674fccb98
Author: Adomas Venčkauskas <adomas.ven@gmail.com>
Date:   Tue, 29 Nov 2016 13:40:12 +0200

Fix connector saving via standalone

Diffstat:
M
chrome/content/zotero/xpcom/server_connector.js
 | 
15
++++-----------
M
chrome/content/zotero/xpcom/translation/translate.js
 | 
1
+

2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/chrome/content/zotero/xpcom/server_connector.js b/chrome/content/zotero/xpcom/server_connector.js
@@ -165,6 +165,7 @@ Zotero.Server.Connector.Detect.prototype = {
 				
 				// get translators
 				me._translate.setDocument(me._browser.contentDocument);
+				me._translate.setLocation(me._parsedPostData["uri"], me._parsedPostData["uri"]);
 				me._translate.getTranslators();
 			} catch(e) {
 				sendResponseCallback(500);
@@ -183,16 +184,8 @@ Zotero.Server.Connector.Detect.prototype = {
 	 */
 	_translatorsAvailable: function(obj, translators) {
 		var jsons = [];
-		for each(var translator in translators) {
-			if(translator.itemType == "multiple") {
-				var icon = "treesource-collection.png"
-			} else {
-				var icon = Zotero.ItemTypes.getImageSrc(translator.itemType);
-				icon = icon.substr(icon.lastIndexOf("/")+1);
-			}
-			var json = {itemType: translator.itemType, translatorID: translator.translatorID,
-				label: translator.label, priority: translator.priority}
-			jsons.push(json);
+		for (let translator of translators) {
+			jsons.push(translator.serialize(TRANSLATOR_PASSING_PROPERTIES));
 		}
 		this.sendResponse(200, "application/json", JSON.stringify(jsons));
 		
@@ -294,7 +287,7 @@ Zotero.Server.Connector.SavePage.prototype = {
 		translate.setHandler("attachmentProgress", function(obj, attachment, progress, error) {
 			Zotero.Server.Connector.AttachmentProgressManager.onProgress(attachment, progress, error);
 		});
-		translate.setHandler("itemsDone", function(obj, item) {
+		translate.setHandler("done", function(obj, item) {
 			Zotero.Browser.deleteHiddenBrowser(me._browser);
 			if(jsonItems.length || me.selectedItems === false) {
 				me.sendResponse(201, "application/json", JSON.stringify({items: jsonItems}));
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -1168,6 +1168,7 @@ Zotero.Translate.Base.prototype = {
 						// if there are translators, add them to the list of found translators
 						if(rpcTranslators) {
 							for(var i=0, n=rpcTranslators.length; i<n; i++) {
+								rpcTranslators[i] = new Zotero.Translator(rpcTranslators[i]);
 								rpcTranslators[i].runMode = Zotero.Translator.RUN_MODE_ZOTERO_STANDALONE;
 							}
 							this._foundTranslators = this._foundTranslators.concat(rpcTranslators);