www

commit 541ebd1f22b1c922bbcff62bac18eb6255ea427b
parent 132284d5fa507d4567678fe6d92e969023a76e5d
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed,  7 Jan 2015 20:10:34 -0500

Merge pull request #596 from aurimasv/conn-reg

Fix regression from 0cd183613f5dacc85676109c3a5c6930e3632fae
Diffstat:
M
chrome/content/zotero/xpcom/translation/translate.js
 | 
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -240,7 +240,13 @@ Zotero.Translate.Sandbox = {
 				if(!Zotero.isBookmarklet) arg = JSON.parse(JSON.stringify(arg));
 				return translation.setSearch(arg);
 			};
-			safeTranslator.setDocument = function(arg) { return translation.setDocument(new XPCNativeWrapper(arg)) };
+			safeTranslator.setDocument = function(arg) {
+				if (Zotero.isFx && !Zotero.isBookmarklet) {
+					return translation.setDocument(new XPCNativeWrapper(arg));
+				} else {
+					return translation.setDocument(arg);
+				}
+			};
 			var errorHandlerSet = false;
 			safeTranslator.setHandler = function(arg1, arg2) {
 				if(arg1 === "error") errorHandlerSet = true;