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

Merge branch 'staging' into update-icons

Browse Source 
# Conflicts:
#	www/kanban/inner.js
This commit is contained in:
daria 2025-09-17 12:16:53 +03:00
commit eeea6887e8
No known key found for this signature in database
GPG Key ID: 3B75240E6B2F2701
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/kanban/inner.js
View File

@ -160,21 +160,21 @@ define([
var onRemoteChange = Util.mkEvent();
var now = function () { return +new Date(); };
var _lastUpdate = 0;
var _updateBoards = function (framework, kanban, boards) {
var _updateBoards = function (framework, kanban, boards, fixCursor) {
_lastUpdate = now();
var cursor = getCursor();
let cursor;
if (fixCursor) { cursor = getCursor(); }
kanban.setBoards(Util.clone(boards));
kanban.inEditMode = false;
addEditItemButton(framework, kanban);
addMoveElementButton(framework, kanban);
restoreCursor(cursor);
onRemoteChange.fire();
if (cursor) { restoreCursor(cursor); }
Lucide.createIcons();
};
var _updateBoardsThrottle = Util.throttle(_updateBoards, 1000);
var updateBoards = function (framework, kanban, boards) {
var updateBoards = function (framework, kanban, boards, fixCursor) {
if ((now() - _lastUpdate) > 5000 || framework.isLocked()) {
_updateBoards(framework, kanban, boards);
_updateBoards(framework, kanban, boards, fixCursor);
return;
}
_updateBoardsThrottle(framework, kanban, boards);
@ -325,6 +325,9 @@ define([
SFCodeMirror.mkIndentSettings(editor, framework._.cpNfInner.metadataMgr);
editor.on('change', function () {
var val = editor.getValue();
if (!dataObject) {
return editor.toTextArea();
}
if (dataObject.body === val) { return; }
dataObject.body = val;
commit();
@ -1063,7 +1066,7 @@ define([
// If the rendering has changed, update the value and redraw
kanban.options.tagsAnd = tagsAnd;
_tagsAnd = tagsAnd;
updateBoards(framework, kanban, kanban.options.boards);
updateBoards(framework, kanban, kanban.options.boards, false);
});
if (migrated) { framework.localChange(); }
@ -1511,7 +1514,8 @@ define([
if (Sortify(currentContent) !== Sortify(remoteContent)) {
verbose("Content is different.. Applying content");
kanban.options.boards = remoteContent;
updateBoards(framework, kanban, remoteContent);
updateBoards(framework, kanban, remoteContent, true);
onRemoteChange.fire();
}
});