www

commit e52ea34e2bae8f0d5fd51b9e24c50dd96f61a967
parent 094fe1c6a2a0e06080b91e5161450803a215949d
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 28 Oct 2008 05:18:55 +0000

Fix obj.isAttachment() sync error (which really should be a "Reconciliation unimplemented" error)


Diffstat:
M
chrome/content/zotero/xpcom/sync.js
 | 
18
++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
@@ -1576,17 +1576,19 @@ Zotero.Sync.Server.Data = new function() {
 											continue;
 										}
 										break;
-									
-									default:
-										Zotero.debug(obj);
-										Zotero.debug(remoteObj);
-										var msg = "Reconciliation unimplemented for " + types;
+								}
+								
+								if (type == 'item') {
+									if (obj.isAttachment()) {
+										var msg = "Reconciliation unimplemented for attachment items";
 										alert(msg);
 										throw(msg);
+									}
 								}
-								
-								if (obj.isAttachment()) {
-									var msg = "Reconciliation unimplemented for attachment items";
+								else {
+									Zotero.debug(obj);
+									Zotero.debug(remoteObj);
+									var msg = "Reconciliation unimplemented for " + types;
 									alert(msg);
 									throw(msg);
 								}