www

commit 433426086567f9c79e86d8b857b4ef444e2e1081
parent aee65951fd21c3a15450cbb889c61d6e93a00c0f
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 20 Jun 2014 03:14:32 -0400

Revert "Use Q instead of Task.spawn to run processUpdatedXML()"

Fixes "Q.async(...)(...) is undefined" sync error

This reverts commit ad8b81f4c7a076b07038990e766ca74482b4609e (which
tried to fix Fx32+ compatibility).

Diffstat:
M
chrome/content/zotero/xpcom/sync.js
 | 
6
++++--
M
resource/q.js
 | 
9
+--------

2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
@@ -1627,7 +1627,9 @@ Zotero.Sync.Server = new function () {
 					_error(e);
 				}
 				
-				Q.async(Zotero.Sync.Server.Data.processUpdatedXML(
+				Components.utils.import("resource://gre/modules/Task.jsm");
+				
+				Task.spawn(Zotero.Sync.Server.Data.processUpdatedXML(
 					responseNode.getElementsByTagName('updated')[0],
 					lastLocalSyncDate,
 					syncSession,
@@ -1836,7 +1838,7 @@ Zotero.Sync.Server = new function () {
 							Zotero.HTTP.doPost(url, body, uploadCallback);
 						}
 					}
-				))()
+				))
 				.then(
 					null,
 					function (e) {
diff --git a/resource/q.js b/resource/q.js
@@ -1021,14 +1021,7 @@ function async(makeGenerator) {
             }
             return when(result, callback, errback);
         }
-        // Added by Dan
-        // If already a generator, use that
-        if (makeGenerator.send) {
-        	var generator = makeGenerator;
-        }
-        else {
-			var generator = makeGenerator.apply(this, arguments);
-		}
+        var generator = makeGenerator.apply(this, arguments);
         var callback = continuer.bind(continuer, "send");
         var errback = continuer.bind(continuer, "throw");
         return callback();