mirror of
https://github.com/cryptpad/cryptpad.git
synced 2026-09-14 11:05:41 +05:00
corrections - wip
This commit is contained in:
Zuzanna
parent
7e136abaa9
commit
1e8338bacf
@ -26,17 +26,17 @@ define([
|
||||
|
||||
var cpIndex = -1;
|
||||
var msgIndex = -1;
|
||||
var APP = window.APP;
|
||||
var ooMessages = {};
|
||||
var loading = false;
|
||||
var currentTime;
|
||||
var position;
|
||||
var patch;
|
||||
var currentVersion;
|
||||
var forward;
|
||||
var APP = window.APP;
|
||||
|
||||
// Get an array of the checkpoint IDs sorted their patch index
|
||||
var hashes = config.onlyoffice.hashes;
|
||||
var sortedCp = Object.keys(hashes).map(Number);
|
||||
var id;
|
||||
|
||||
var sortedCp = Object.keys(hashes).map(Number).sort(function (a, b) {
|
||||
@ -67,33 +67,28 @@ define([
|
||||
var Messages = common.Messages;
|
||||
|
||||
var getVersion = function (position) {
|
||||
if (Object.keys(ooMessages).length) {
|
||||
let version = (id === -1 || id === 0) ? 0 : id;
|
||||
|
||||
if (position === undefined) {
|
||||
position = ooMessages[id]?.length || 0;
|
||||
} else if (position === ooMessages[id]?.length && hashes[version + 1]) {
|
||||
position = 0;
|
||||
if (ooMessages[id]?.length) {
|
||||
version++;
|
||||
}
|
||||
}
|
||||
return version + '.' + position;
|
||||
if (!Object.keys(ooMessages).length) { return; }
|
||||
let version = (id === -1 || id === 0) ? 0 : id;
|
||||
|
||||
if (typeof(position) === "undefined") {
|
||||
position = ooMessages[id]?.length || 0;
|
||||
} else if (position === ooMessages[id]?.length && hashes[version + 1]) {
|
||||
position = 0;
|
||||
if (ooMessages[id]?.length) { version++; }
|
||||
}
|
||||
return version + '.' + position;
|
||||
};
|
||||
|
||||
var showVersion = function (initial, position) {
|
||||
currentVersion = getVersion(position, initial);
|
||||
if (initial) {
|
||||
currentVersion = Messages.oo_version_latest;
|
||||
}
|
||||
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 = APP.next ? msgIndex+1 : msgIndex;
|
||||
var messageIndex = forward ? msgIndex+1 : msgIndex;
|
||||
if (!Object.keys(hashes).length) {
|
||||
p = 100-100*((messageIndex ) / (-msgs.length));
|
||||
} else {
|
||||
@ -106,9 +101,7 @@ define([
|
||||
var segments = id/hashLength;
|
||||
p = 100*(segments);
|
||||
|
||||
if (id === 0) {
|
||||
p = 0;
|
||||
}
|
||||
if (id === 0) { p = 0; }
|
||||
|
||||
var percentage = ((position/msgs.length)*100);
|
||||
var timelinePosition = (percentage/100)*(100/hashLength);
|
||||
@ -124,7 +117,7 @@ define([
|
||||
update();
|
||||
};
|
||||
|
||||
function getMessages(fromHash, toHash, cpIndex, sortedCp, cp, config, fillOO, $share, ooCheckpoints, callback) {
|
||||
var getMessages = function(fromHash, toHash, cpIndex, sortedCp, cp, config, fillOO, $share, ooCheckpoints, callback) {
|
||||
sframeChan.query('Q_GET_HISTORY_RANGE', {
|
||||
channel: config.onlyoffice.channel,
|
||||
lastKnownHash: fromHash,
|
||||
@ -134,9 +127,9 @@ define([
|
||||
if (!Array.isArray(data.messages)) { return void console.error('Not an array!'); }
|
||||
|
||||
let initialCp = cpIndex === sortedCp.length || cp ? !cp?.hash : undefined;
|
||||
var messages = (data.messages || []).slice(initialCp || APP.ooconfig.documentType === 'spreadsheet' ? 0 : 1);
|
||||
var messages = (data.messages || []).slice(initialCp || config.docType() === 'spreadsheet' ? 0 : 1);
|
||||
if (config.debug) { console.log(data.messages); }
|
||||
id = id !== undefined ? id : getId();
|
||||
id = typeof(id) !== "undefined" ? id : getId();
|
||||
fillOO(messages, ooCheckpoints);
|
||||
loading = false;
|
||||
// $share.show();
|
||||
@ -150,10 +143,10 @@ define([
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!Array.isArray(sortedCp)) {
|
||||
console.error("Wrong type");
|
||||
return resolve();
|
||||
return reject();
|
||||
}
|
||||
|
||||
id = id !== undefined ? id : getId();
|
||||
|
||||
id = typeof(id) !== "undefined" ? id : getId();
|
||||
|
||||
if (ooMessages[id-1] && !ooMessages[id-1].length) {
|
||||
var cp = hashes[id-1];
|
||||
@ -171,7 +164,7 @@ define([
|
||||
reject(err);
|
||||
return;
|
||||
}
|
||||
resolve();
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
};
|
||||
@ -180,8 +173,8 @@ define([
|
||||
|
||||
var onClose = function () { config.setHistory(false); };
|
||||
var onRevert = function () {
|
||||
APP.revert = true
|
||||
config.onRevert();
|
||||
APP.revert = true;
|
||||
config.onRevert(true);
|
||||
};
|
||||
|
||||
config.setHistory(true);
|
||||
@ -227,7 +220,7 @@ define([
|
||||
}
|
||||
|
||||
var next = async function () {
|
||||
APP.next = true;
|
||||
forward = true;
|
||||
msgIndex++;
|
||||
msgs = ooMessages[id];
|
||||
|
||||
@ -248,12 +241,10 @@ define([
|
||||
config.onPatchBack(hashes[id], [patch]);
|
||||
}
|
||||
} else {
|
||||
if (!msgs.length) return config.onPatchBack(hashes[id + 1]);
|
||||
if (Math.abs(msgIndex) > msgs.length) msgIndex = -msgs.length;
|
||||
if (!msgs.length) { return config.onPatchBack(hashes[id + 1]); }
|
||||
if (Math.abs(msgIndex) > msgs.length) { msgIndex = -msgs.length; }
|
||||
}
|
||||
} else if (msgs.length + msgIndex === -1) {
|
||||
msgIndex++;
|
||||
}
|
||||
} else if (msgs.length + msgIndex === -1) { msgIndex++; }
|
||||
|
||||
patch = msgs[msgs.length + msgIndex];
|
||||
position = msgs.indexOf(patch) + 1;
|
||||
@ -266,7 +257,7 @@ define([
|
||||
var msgs;
|
||||
|
||||
var prev = function () {
|
||||
APP.next = false;
|
||||
forward = false;
|
||||
msgs = ooMessages[id];
|
||||
let hasHashes = Object.keys(hashes).length;
|
||||
let cp = hasHashes ? hashes[id] : {};
|
||||
|
||||
@ -2911,13 +2911,17 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
|
||||
resetData(blob, fileType);
|
||||
} catch (e) {
|
||||
var file = getFileType();
|
||||
var type = common.getMetadataMgr().getPrivateData().ooType;
|
||||
var type = common.getMetadataMgr().gistoryetPrivateData().ooType;
|
||||
var blob = loadInitDocument(type, true);
|
||||
if (!keepQueue) { ooChannel.queue = []; }
|
||||
resetData(blob, file);
|
||||
}
|
||||
};
|
||||
|
||||
var loadHistoryCp = function (cp, keepQueue) {
|
||||
loadCp(cp, keepQueue)
|
||||
}
|
||||
|
||||
var loadTemplate = function (href, pw, parsed) {
|
||||
APP.history = true;
|
||||
APP.template = true;
|
||||
@ -3121,10 +3125,11 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
|
||||
if (!privateData.ooVersionHash) {
|
||||
(function () {
|
||||
/* add a history button */
|
||||
var commit = function () {
|
||||
var commit = function (revert) {
|
||||
// Wait for the checkpoint to be uploaded before leaving history mode
|
||||
// (race condition). We use "stopHistory" to remove the history
|
||||
// flag only when the checkpoint is ready.
|
||||
// APP.revert = revert ? true : false;
|
||||
APP.stopHistory = true;
|
||||
makeCheckpoint(true);
|
||||
};
|
||||
@ -3158,6 +3163,9 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
|
||||
loadCp(cp);
|
||||
}
|
||||
};
|
||||
var docType = function() {
|
||||
return APP.ooconfig.documentType;
|
||||
}
|
||||
var setHistoryMode = function (bool) {
|
||||
if (bool) {
|
||||
APP.history = true;
|
||||
@ -3225,7 +3233,9 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
|
||||
var histConfig = {
|
||||
onPatch: onPatch,
|
||||
onPatchBack: onPatchBack,
|
||||
docType: docType,
|
||||
loadCp: loadCp,
|
||||
loadHistoryCp: loadHistoryCp,
|
||||
onCheckpoint: onCheckpoint,
|
||||
onRevert: commit,
|
||||
setHistory: setHistoryMode,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user