dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'history' into historyOO

This commit is contained in:
yflory 2020-09-22 15:28:35 +02:00
parent 3ae8d983f7 74577b54e4
commit 68423f49bc
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/outer/async-store.js
View File

@ -1456,7 +1456,6 @@ define([
var channels = Store.channels = store.channels = {};
var getVersionHash = function (clientId, data) {
var validateKey;
var fakeNetflux = Hash.createChannelId();
Store.getHistoryRange(clientId, {
cpCount: 1,

2
www/common/sframe-common-history.js
View File

@ -180,7 +180,7 @@ define([
if (semantic) {
// If semantic is truc, jump to the next patch from a different netflux ID
var author = states[idx].author;
for (j = idx; (j > 1 && j < (states.length - 1)); ((i > c) ? j++ : j--)) {
for (var j = idx; (j > 1 && j < (states.length - 1)); ((i > c) ? j++ : j--)) {
idx = j;
i = getRank(idx);
if (author !== states[j].author) {