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

wip

Browse Source
This commit is contained in:
Zuzanna 2025-10-22 10:06:20 +02:00
parent db1cb475ac
commit 6ba41369c5
1 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
www/common/onlyoffice/history.js
View File

@ -30,7 +30,6 @@ define([
var ooMessages = {};
var ooCheckpoints = {};
var loading = false;
var update = function () {};
var currentTime;
// Get an array of the checkpoint IDs sorted their patch index
@ -196,7 +195,7 @@ define([
var $fastPrev, $fastNext, $next, $prev;
update = function (prev) {
var update = function (prev) {
var cps = sortedCp.length;
$fastPrev.show();
$next.show();
@ -207,10 +206,10 @@ define([
var msgLength = Object.keys(hashes).length
if ((id === -1 || id === 0) && ooMessages[id].length+1 === Math.abs(msgIndex)) {
if ((id === -1 || id === 0) && ooMessages[id]?.length+1 === Math.abs(msgIndex)) {
$fastPrev.prop('disabled', 'disabled');
}
if ((id === -1 || id === 0) && ooMessages[id].length+1 === Math.abs(msgIndex)) {
if ((id === -1 || id === 0) && ooMessages[id]?.length+1 === Math.abs(msgIndex)) {
$prev.prop('disabled', 'disabled');
}
var msgs = ooMessages[id]?.length;
@ -219,17 +218,34 @@ define([
parseInt(Object.keys(hashes)[Object.keys(hashes).length - 1]) === id && parseInt(Object.keys(ooMessages)[Object.keys(ooMessages).length - 1]) === id && !ooMessages[id].length) {
$fastNext.prop('disabled', 'disabled');
}
console.log(hashes, ooMessages, id, msgIndex)
console.log(hashes, ooMessages, id, msgIndex, msgLength)
// console.log(Object.keys(hashes)[Object.keys(hashes).length - 1] === Object.keys(ooMessages)[Object.keys(ooMessages).length - 1] === id && !ooMessages[id].length,
// Object.keys(hashes)[Object.keys(hashes).length - 1] === Object.keys(ooMessages)[Object.keys(ooMessages).length - 1], id, typeof id,
// typeof parseInt(Object.keys(hashes)[Object.keys(hashes).length - 1]),
// parseInt(Object.keys(hashes)[Object.keys(hashes).length - 1]) === id && parseInt(Object.keys(ooMessages)[Object.keys(ooMessages).length - 1]) === id,
// ooMessages[id])
console.log(("next update", id === msgLength) && msgIndex === -1, id === -1 && msgIndex === -1, (id === msgLength || id === msgLength-1) && msgIndex === -1 && !prev || Object.keys(hashes)[Object.keys(hashes).length - 1] === Object.keys(ooMessages)[Object.keys(ooMessages).length - 1] === id && !ooMessages[id].length)
if ((id === msgLength) && msgIndex === -1 || id === -1 && msgIndex === -1 || (id === msgLength || id === msgLength-1) && msgIndex === -1 && !prev ||
parseInt(Object.keys(hashes)[Object.keys(hashes).length - 1]) === id && parseInt(Object.keys(ooMessages)[Object.keys(ooMessages).length - 1]) === id && !ooMessages[id].length) {
$next.prop('disabled', 'disabled');
// console.log((id === msgLength) && msgIndex === -1,
// id === -1 && msgIndex === -1,
// (id === msgLength || id === msgLength-1) && msgIndex === -1 && !prev || Object.keys(hashes)[Object.keys(hashes).length - 1] === Object.keys(ooMessages)[Object.keys(ooMessages).length - 1] === id && !ooMessages[id].length)
// console.log((id === msgLength) && msgIndex === -1,
// id === -1 && msgIndex === -1,
// (id === msgLength || id === msgLength-1) && msgIndex === -1 && !prev,
// Object.keys(hashes)[Object.keys(hashes).length - 1] === Object.keys(ooMessages)[Object.keys(ooMessages).length - 1] === id && !ooMessages[id].length)
var lastHash = hashes[hashes.length-1]
console.log((id === msgLength) && msgIndex === -1,
id === -1 && msgIndex === -1,
// (id === msgLength || id+1 === msgLength) && !ooMessages[id].length && msgIndex === -1 && !prev,
parseInt(Object.keys(hashes)[Object.keys(hashes).length - 1]) === id &&
parseInt(Object.keys(ooMessages)[Object.keys(ooMessages).length - 1]) === id && !ooMessages[id].length)
if ((id === msgLength) && msgIndex === -1 || id === -1 && msgIndex === -1 ||
// id === msgLength && msgIndex === -1 && !prev ||
parseInt(Object.keys(hashes)[Object.keys(hashes).length - 1]) === id &&
parseInt(Object.keys(ooMessages)[Object.keys(ooMessages).length - 1]) === id && !ooMessages[id].length) {
// $next.prop('disabled', 'disabled');
}
};
@ -242,10 +258,10 @@ define([
}
var next = async function () {
console.log("next1", hashes, id, ooMessages, msgIndex)
msgIndex++;
msgs = ooMessages[id];
// console.log("next1", hashes, id, ooMessages, msgIndex, msgs)
if (Object.keys(hashes).length) {
if (msgIndex === 0) {
id++;
@ -270,20 +286,25 @@ define([
})
return;
}
else if (Math.abs(msgIndex) > msgs.length) {
msgIndex = -msgs.length
}
}
else if (msgs.length + msgIndex === -1) {
msgIndex++
}
var patch = msgs[msgs.length + msgIndex];
console.log("next0.5", msgIndex, msgs, msgs.length + msgIndex)
// console.log("next0.5", hashes, id, ooMessages, msgIndex, msgs, msgs.length + msgIndex)
config.onPatch(patch);
showVersion(false, msgs.indexOf(patch)+1);
loadingFalse();
console.log("next2", hashes, id, ooMessages)
};
var msgs;
var prev = function () {
console.log("prev1", hashes, id, ooMessages)
// console.log("prev1", hashes, id, ooMessages)
msgs = ooMessages[id];
if (!Object.keys(hashes).length) {
var cp = {};
@ -309,7 +330,7 @@ define([
showVersion(false, queue.length);
msgIndex--;
loadingFalse();
console.log("prev2", hashes, id, ooMessages)
// console.log("prev2", hashes, id, ooMessages)
};
@ -426,7 +447,7 @@ define([
// Go to previous checkpoint
$fastNext.click(function () {
if (loading) { return; }
console.log("fastnext1", hashes, id, ooMessages)
// console.log("fastnext1", hashes, id, ooMessages, msgIndex)
loading = true;
if (id < Object.keys(hashes).length && id !== -1) {
if (id === -1) {
@ -438,7 +459,9 @@ define([
var cp = hashes[id];
loadMoreOOHistory()
config.loadCp(cp);
console.log("fastnext0.5", hashes, id, ooMessages, msgIndex)
msgs = ooMessages[id]
msgIndex = -msgs.length-1
// console.log("fastnext0.5", hashes, id, ooMessages, msgIndex)
setTimeout(function () {
update();
loading = false;
@ -453,35 +476,38 @@ define([
var msgs = ooMessages[id]
msgIndex = -1
config.onPatchBack(cp, msgs);
}
console.log("fastnext2", hashes, id, ooMessages, msgIndex)
// console.log("fastnext2", hashes, id, ooMessages, msgIndex)
setTimeout(function () {
update();
update('end');
loading = false;
}, 100);
});
// Go to next checkpoint
$fastPrev.click(function () {
console.log("fastprev1", hashes, id, ooMessages, msgIndex)
// console.log("fastprev1", hashes, id, ooMessages, msgIndex)
if (loading) { return; }
loading = true;
if (!ooMessages[id].length || ooMessages[id].length+1 === Math.abs(msgIndex)) {
if (!ooMessages[id].length || ooMessages[id].length+2 === Math.abs(msgIndex)) {
// console.log("fastprev0.25", ooMessages[id].length+1, Math.abs(msgIndex))
id--;
}
// console.log("fastprev0.5", ooMessages[id]?.length+1, Math.abs(msgIndex))
var cp = hashes[id];
config.loadCp(cp);
loadMoreOOHistory().then(() => {
var msgs = ooMessages[id];
msgIndex = -msgs.length-1;
msgIndex = -msgs.length-2;
update(true);
// console.log("fastprev2", hashes, id, ooMessages, msgIndex)
});
loading = false;
console.log("fastprev2", hashes, id, ooMessages)
});
onKeyDown = function (e) {