(fix) proper fix for #3389

This commit is contained in:
Ludovic Marcotte
2015-12-01 11:42:02 -05:00
parent 8456d49686
commit 8c0ef9cf50

View File

@@ -1068,6 +1068,8 @@ freeBusyRequest.prototype = {
this.mEnd);
this.mListener.onRequestComplete(this, true, entries);
}
} else if (http.status == 404 && this.mPendingRequests == 0) {
this.mListener.onRequestComplete(this, false);
}
}
};
@@ -1121,13 +1123,17 @@ editorConflictHandler.prototype = {
onRequestComplete: function eCH_onRequestComplete(fbRequest, success,
entries) {
var periodEntries = entries.slice(this.mQuOffset, this.mQuOffsetMax);
if (periodEntries.indexOf("1") > -1) {
this.mListener.onRequestComplete(this, false);
}
else {
this.mCurrentUid++;
this._step();
if (success) {
var periodEntries = entries.slice(this.mQuOffset, this.mQuOffsetMax);
if (periodEntries.indexOf("1") > -1) {
this.mListener.onRequestComplete(this, false);
}
else {
this.mCurrentUid++;
this._step();
}
} else {
this.mListener.onRequestComplete(this, true);
}
}
};