www

commit d40822c5409313f68808ed06a344c1406e891df7
parent dc71af9110e2e575f6ed59870b9573dae913fef9
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed,  5 Jul 2017 05:45:00 -0400

Fix streaming server connection when auto-sync is on with no credentials

Diffstat:
M
chrome/content/zotero/xpcom/streamer.js
 | 
16
+++++++---------

1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/chrome/content/zotero/xpcom/streamer.js b/chrome/content/zotero/xpcom/streamer.js
@@ -32,14 +32,11 @@ Zotero.Streamer_Module = function (options = {}) {
 	this.apiKey = options.apiKey;
 	
 	let observer = {
-		notify: function (event, type) {
-			if (event == 'modify') {
-				this.init();
-			}
-			else if (event == 'delete') {
-				this._disconnect();
+		notify: (event, type) => {
+			if (event == 'modify' || event == 'delete') {
+				this._update();
 			}
-		}.bind(this)
+		}
 	};
 	this._observerID = Zotero.Notifier.registerObserver(observer, ['api-key'], 'streamer');
 };
@@ -83,7 +80,7 @@ Zotero.Streamer_Module.prototype = {
 		var subscriptionsToAdd = [];
 		var subscriptionsToRemove = [];
 		
-		if (Zotero.Prefs.get('sync.autoSync')) {
+		if (Zotero.Prefs.get('sync.autoSync') && Zotero.Sync.Runner.enabled) {
 			if (!this._subscriptions.has('sync')) {
 				// Subscribe to all topics accessible to the API key
 				subscriptionsToAdd.push({ apiKey });
@@ -135,7 +132,8 @@ Zotero.Streamer_Module.prototype = {
 	_isEnabled: function () {
 		return Zotero.Prefs.get('streaming.enabled')
 			// Only connect if either auto-sync or automatic style/translator updates are enabled
-			&& (Zotero.Prefs.get('sync.autoSync') || Zotero.Prefs.get('automaticScraperUpdates'));
+			&& ((Zotero.Prefs.get('sync.autoSync') && Zotero.Sync.Runner.enabled)
+				|| Zotero.Prefs.get('automaticScraperUpdates'));
 	},