web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
ansuz 2019-09-27 11:57:09 +02:00
commit 83c19f01f3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1742,7 +1742,9 @@ define([
Store.loadSharedFolder(null, id, data, cb); Store.loadSharedFolder(null, id, data, cb);
}; };
Store.loadSharedFolderAnon = function (clientId, data, cb) { Store.loadSharedFolderAnon = function (clientId, data, cb) {
Store.loadSharedFolder(null, data.id, data.data, cb); Store.loadSharedFolder(null, data.id, data.data, function () {
cb();
});
}; };
Store.addSharedFolder = function (clientId, data, cb) { Store.addSharedFolder = function (clientId, data, cb) {
var s = getStore(data.teamId); var s = getStore(data.teamId);

2
www/kanban/inner.js
View File

@ -139,7 +139,7 @@ define([
// Remove the input // Remove the input
$(el).text(name); $(el).text(name);
// Save the value for the correct board // Save the value for the correct board
var board = $(el.parentNode.parentNode.parentNode).attr("data-id"); var board = $(el).closest('.kanban-board').attr("data-id");
var pos = kanban.findElementPosition(el.parentNode); var pos = kanban.findElementPosition(el.parentNode);
kanban.getBoardJSON(board).item[pos].title = name; kanban.getBoardJSON(board).item[pos].title = name;
kanban.onChange(); kanban.onChange();

5
www/kanban/jkanban.js
View File

@ -271,7 +271,10 @@
if (element.id) { if (element.id) {
nodeItem.setAttribute('data-eid', element.id) nodeItem.setAttribute('data-eid', element.id)
} }
nodeItem.innerHTML = element.title; var nodeItemText = document.createElement('div');
nodeItemText.classList.add('kanban-item-text');
nodeItemText.innerHTML = element.title;
nodeItem.appendChild(nodeItemText);
//add function //add function
nodeItem.clickfn = element.click; nodeItem.clickfn = element.click;
nodeItem.dragfn = element.drag; nodeItem.dragfn = element.drag;