www

commit 80b10184b0f91bdf49c17df1aacd9f8267438cac
parent 5a664ec3d95fd06b0b41f2351bec13aad8ac4d6d
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 15 Apr 2013 14:52:51 -0400

Fix race condition when running bookmarklet from Standalone server

Diffstat:
M
chrome/content/zotero/xpcom/connector/connector.js
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/connector/connector.js b/chrome/content/zotero/xpcom/connector/connector.js
@@ -74,7 +74,8 @@ Zotero.Connector = new function() {
 					
 					_ieConnectorCallbacks = [];
 					var listener = function(event) {
-						if(event.origin !== "http://127.0.0.1:23119") return;
+						if(event.origin !== "http://127.0.0.1:23119"
+								|| event.source !== iframe.contentWindow) return;
 						if(event.stopPropagation) {
 							event.stopPropagation();
 						} else {