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

more cleaning/comments

Browse Source
This commit is contained in:
Zuzanna 2025-12-02 11:37:03 +01:00
parent 93bfdf4238
commit 292f631bd4
2 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,45 +76,6 @@ define([
return version + '.' + position;
};
// var showVersion = function (initial, position) {
// currentVersion = getVersion(position, initial);
// if (initial) { currentVersion = Messages.oo_version_latest; }
// $version.text(Messages.oo_version + currentVersion);
// var $pos = $hist.find('.cp-history-timeline-pos');
// if (!ooMessages[id]) { return; }
// var msgs = ooMessages[id];
// var p;
// var messageIndex = forward ? msgIndex+1 : msgIndex;
// if (!Object.keys(hashes).length) {
// p = 100-100*((messageIndex ) / (-msgs.length));
// } else {
// var lastHash = hashes[Object.keys(hashes).pop()].hash;
// if (lastHash === config.onlyoffice.lastHash) {
// var hashLength = Object.keys(hashes).length;
// } else {
// var hashLength = Object.keys(hashes).length+1;
// }
// var segments = id/hashLength;
// p = 100*(segments);
// if (id === 0) { p = 0; }
// var percentage = ((position/msgs.length)*100);
// var timelinePosition = (percentage/100)*(100/hashLength);
// p += timelinePosition;
// }
// $pos.css('margin-left', p+'%');
// var time = msgs[msgIndex] && msgs[msgIndex].time;
// currentTime = time;
// if (time) { $time.text(new Date(time).toLocaleString()); }
// else { $time.text(''); }
// update();
// loadingFalse();
// };
var getMessages = function(fromHash, toHash, callback) {
sframeChan.query('Q_GET_HISTORY_RANGE', {
channel: config.onlyoffice.channel,
@ -143,6 +104,7 @@ define([
return reject();
}
// Get the checkpoint ID
id = typeof(id) !== "undefined" ? id : getId();
var cp;
if (ooMessages[id-1] && !ooMessages[id-1].length) {
@ -150,10 +112,18 @@ define([
} else {
cp = hashes[id];
}
// Get the history between "toHash" and "fromHash". This function is using
// "getOlderHistory", that's why we start from the more recent hash
// and we go back in time to an older hash
// We need to get all the patches between the current cp hash and the next cp hash
var nextId = hashes[id+1] ? hashes[id+1] : undefined;
var toHash = nextId ? nextId.hash : config.onlyoffice.lastHash;
// Current cp or initial hash (invalid hash ==> initial hash)
var fromHash = cp?.hash || 'NONE';
// Next cp or last hash
var toHash = nextId ? nextId.hash : config.onlyoffice.lastHash;
getMessages(toHash, fromHash, function (err) {
if (err) {
@ -170,7 +140,7 @@ define([
var onClose = function () { config.setHistory(false); };
var onRevert = function () {
config.onRevert(true);
config.onRevert();
};
config.setHistory(true);
@ -582,7 +552,7 @@ define([
config.onPatchBack(cp, msgs);
}
loading = false;
loadingFalse();
position = msgs?.length;
showVersion(false, position);
});
@ -604,7 +574,7 @@ define([
update(true);
});
position = 0;
loading = false;
loadingFalse();
});
onKeyDown = function (e) {
var p = function () { e.preventDefault(); };
@ -623,7 +593,7 @@ define([
});
});
$(snapshot).click(function () {
// if (cpIndex === -1 && msgIndex === -1) { return void UI.warn(Messages.snapshots_ooPickVersion); }
if (cpIndex === -1 && msgIndex === -1) { return void UI.warn(Messages.snapshots_ooPickVersion); }
var input = h('input', {
placeholder: Messages.snapshots_placeholder
});

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

@ -593,7 +593,7 @@ define([
blob.name = title || (metadataMgr.getMetadataLazy().title || file.doc) + '.' + file.type;
var data = {
hash: (APP.history || APP.template) ? ooChannel.historyLastHash : ooChannel.lastHash,
index: (APP.history || APP.template) ? ooChannel.currentIndex : ooChannel.cpIndex
index: (APP.history || APP.template) ? ooChannel.currentIndex : ooChannel.cpIndex
};
fixSheets();