infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix UI issues with OO history

pull/1/head
yflory 2020-09-22 10:56:57 +02:00
parent c4bba88afd
commit 1691233bc8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,8 @@ define([
return hashes[a].index - hashes[b].index;
});
var endWithCp = config.onlyoffice.lastHash === hashes[sortedCp[sortedCp.length - 1]].hash;
var fillOO = function (id, messages) {
if (!id) { return; }
if (ooMessages[id]) { return; }
@ -38,6 +40,8 @@ define([
update();
};
if (endWithCp) { cpIndex = 0; }
// We want to load a checkpoint (or initial state)
var loadMoreOOHistory = function () {
if (!Array.isArray(sortedCp)) { return void console.error("Wrong type"); }
@ -138,7 +142,7 @@ define([
var id = sortedCp[cps - cpIndex -1] || -1;
if (!ooMessages[id]) { return; }
var msgs = ooMessages[id];
var p = 100*(msgIndex / (msgs.length-1));
var p = 100*(msgIndex / (msgs.length));
$pos.css('margin-left', p+'%');
};
@ -177,7 +181,7 @@ define([
/*if (msgIndex <= 0) {
$prev.hide();
}*/
if (msgIndex >= (msgs - 1)) {
if (msgIndex >= msgs) {
$next.hide();
}
};
@ -283,6 +287,7 @@ define([
var onKeyDown, onKeyUp;
var close = function () {
History.loading = false;
$hist.hide();
$bottom.show();
$(window).trigger('resize');
@ -300,6 +305,7 @@ define([
UI.confirm(Messages.history_restorePrompt, function (yes) {
if (!yes) { return; }
close();
History.loading = false;
onRevert();
UI.log(Messages.history_restoreDone);
});
@ -351,9 +357,6 @@ define([
display();
if (config.onlyoffice.lastHash === hashes[sortedCp[sortedCp.length - 1]].hash) {
cpIndex = 0;
}
showVersion(true);
//return void loadMoreOOHistory();