The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-12 19:49:59 +05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Prepare Office history corruption fix"

Browse Source 
This reverts commit fd9c19b6e6.
This commit is contained in:
Wolfgang Ginolas 2026-05-20 11:14:54 +02:00
parent d4e94daa6f
commit 78473cd816
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/common/onlyoffice/inner.js
View File

@ -565,7 +565,6 @@ define([
isLockedModal.modal = UI.openCustomModal(isLockedModal.content);
}
myUniqueOOId = undefined;
// myIndex = undefined; TODO enable fix
setMyId();
if (APP.docEditor) { APP.docEditor.destroyEditor(); } // Kill the old editor
@ -2999,7 +2998,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
pinImages();
};
const loadCheckpoint = async function (cp, keepQueue) {
const loadCp = async function (cp, keepQueue) {
if (!isLockedModal.modal) {
isLockedModal.modal = UI.openCustomModal(isLockedModal.content);
}
@ -3019,7 +3018,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
var loadHistoryCp = function (cp, keepQueue) {
APP.history = true;
APP.stopHistory = false;
loadCheckpoint(cp, keepQueue);
loadCp(cp, keepQueue);
};
var loadTemplate = function (href, pw, parsed) {
@ -3069,7 +3068,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
});
ooChannel.historyLastHash = ooChannel.lastHash;
ooChannel.currentIndex = ooChannel.cpIndex;
loadCheckpoint(lastCp, true);
loadCp(lastCp, true);
});
};
@ -3240,7 +3239,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
};
var onCheckpoint = function (cp) {
// We want to load a checkpoint:
loadCheckpoint(cp, true);
loadCp(cp, true);
};
var onPatchBack = function (cp, msgs) {
APP.history = true;
@ -3260,10 +3259,10 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
});
ooChannel.queue = msgsFormatted;
setTimeout(function () {
loadCheckpoint(cp, true);
loadCp(cp, true);
}, 200);
} else {
loadCheckpoint(cp);
loadCp(cp);
}
};
var docType = function() {
@ -3284,7 +3283,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
// Fill the queue and then load the last CP
rtChannel.getHistory(function () {
var lastCp = getLastCp();
loadCheckpoint(lastCp, true);
loadCp(lastCp, true);
});
};
@ -3342,7 +3341,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
onPatch: onPatch,
onPatchBack: onPatchBack,
docType: docType,
loadCp: loadCheckpoint,
loadCp: loadCp,
loadHistoryCp: loadHistoryCp,
onCheckpoint: onCheckpoint,
onRevert: commit,