This commit is contained in:
Zuzanna 2025-12-29 17:23:22 +01:00
parent eb96061784
commit f92a42d0cb
6 changed files with 9 additions and 6 deletions

View File

@ -291,10 +291,10 @@
}
.cp-history-timeline-pos {
// width: 2px;
//width: 2px;
border: 2px solid @cryptpad_text_col;
height: 37px;
// background: @pos-color;
//background: @pos-color;
position: absolute;
svg {
top: -14px;

View File

@ -288,7 +288,7 @@ var closeChannel = function (env, channelName, cb) {
var closeInactiveChannels = function (env, schedule, active) {
Object.keys(env.channels).forEach(channelName => {
if (!active.has(channelName)) {
if (!active.includes(channelName)) {
schedule.ordered(channelName, function (next) {
closeChannel(env, channelName, next);
});

View File

@ -2384,6 +2384,7 @@ define([
var $restricted = $restrictedIcon.clone().appendTo($state);
$restricted.attr('title', Messages.fm_restricted);
}
var $shared = $sharedIcon.clone().appendTo($state);
$shared.attr('title', Messages.fm_canBeShared);
} else if ($content.data('readOnlyFolder') || APP.readOnly) {

View File

@ -88,7 +88,7 @@ define([
if (!Array.isArray(data.messages)) { return void console.error('Not an array!'); }
let initialCp = cpIndex === sortedCp.length;
var messages = (data.messages || []).slice(initialCp || config.docType() === 'spreadsheet' ? 0 : 1);
var messages = (data.messages || []).slice(initialCp || (config.docType() === 'spreadsheet' && toHash === 'NONE') ? 0 : 1);
if (config.debug) { console.log(data.messages); }
id = typeof(id) !== "undefined" ? id : getId();
@ -109,6 +109,7 @@ define([
// Get the checkpoint ID
id = typeof(id) !== "undefined" ? id : getId();
var cp;
console.log("HELLO", ooMessages, id, ooMessages[id-1])
if (ooMessages[id-1] && !ooMessages[id-1].length) {
cp = hashes[id-1];
} else {
@ -300,7 +301,7 @@ define([
config.onPatchBack(hashes[cpNo], q);
patch = msgs[patchNo];
}
position = msgs.indexOf(patch)
position = msgs.indexOf(patch);
msgIndex = position === -1 ? -1 : position - msgs.length-1;
showVersion(false, position);
update();

View File

@ -3073,6 +3073,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
readOnly = privateData.readOnly;
Title = common.createTitle({});
var configTb = {
displayed: ['pad'],
title: Title.getTitleConfig(),

View File

@ -689,7 +689,7 @@ define([
// Load all the history messages into a new chainpad object
loadMoreHistory(config, common, function (err, newRt, isFull) {
// History.readOnly = common.getMetadataMgr().getPrivateData().readOnly;
History.readOnly = common.getMetadataMgr().getPrivateData().readOnly;
History.loading = false;
if (err) {
console.error(err);