suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix an XML parsing error (due to trailing whitespace, weirdly) that could cause endless sync icon spinning

Browse Source 
- Remove extra whitespace in collection-item blocks that was causing sync upload errors (also fixed on the server)
This commit is contained in:
Dan Stillman 2010-08-26 21:34:44 +00:00
parent 4bc7ab9016
commit 6a629490b3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chrome/content/zotero/xpcom/sync.js
View File

@ -1351,8 +1351,10 @@ Zotero.Sync.Server = new function () {
_error(response.firstChild.firstChild.nodeValue); _error(response.firstChild.firstChild.nodeValue);
} }
var xml = Zotero.Utilities.prototype.trim(xmlhttp.responseText.replace(/<\?xml.*\?>\s*/, ''));
// Strip XML declaration and convert to E4X // Strip XML declaration and convert to E4X
var xml = new XML(xmlhttp.responseText.replace(/<\?xml.*\?>/, '')); xml = new XML(xml);
try { try {
var updateKey = xml.@updateKey.toString(); var updateKey = xml.@updateKey.toString();
@ -3741,7 +3743,7 @@ Zotero.Sync.Server.Data = new function() {
xml.collections + ' ' + child.id : child.id; xml.collections + ' ' + child.id : child.id;
} }
else */if (child.type == 'item') { else */if (child.type == 'item') {
xml.items = xml.items ? xml.items = xml.items.toString() ?
xml.items + ' ' + child.key : child.key; xml.items + ' ' + child.key : child.key;
} }
} }