Merge branch '2025.3.1-rc' into 2025.3.1-test

This commit is contained in:
yflory 2025-04-17 13:58:10 +02:00
commit 09c78dc00d
3 changed files with 12 additions and 4 deletions

View File

@ -2383,10 +2383,17 @@ const factory = (ApiConfig = {}, Sortify, UserObject, ProxyManager,
var parsed = parse(msg);
if (parsed[1] !== txid) { console.log('bad txid'); return; }
if (parsed[0] === 'HISTORY_RANGE_ERROR') {
cb({
let err = parsed[2];
if (err?.code === 'ENOENT') {
completed = true;
return void cb({
messages: msgs,
isFull: true
});
}
return void cb({
error: parsed[2]
});
return;
}
if (parsed[0] === 'HISTORY_RANGE_END') {
cb({

View File

@ -1724,7 +1724,7 @@ define([
deleteOfflineLocks();
handleNewLocks({}, content.locks);
if (APP.unsavedChanges) {
var unsaved = APP.unsavedChanges;
var unsaved = APP.unsavedChanges;
delete APP.unsavedChanges;
rtChannel.sendMsg(unsaved, null, function (err, hash) {
if (err) { return void UI.alert(Messages.oo_lostEdits); }
@ -1853,6 +1853,7 @@ define([
permissions: {
download: dc?.permissions?.download || false,
print: dc?.permissions?.print || true,
protect: false
}
},
"documentType": file.doc,

File diff suppressed because one or more lines are too long