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

fix jscolor picker for new kanban items and fix the code according to CI

Browse Source
This commit is contained in:
MTRNord 2018-09-13 16:20:42 +02:00
parent e7a1433a30
commit 8b384d6bb3
No known key found for this signature in database
GPG Key ID: E5B89311FAB91B9F
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/kanban/inner.js
View File

@ -250,12 +250,12 @@ define([
jscolorL = new window.jscolor(el,{onFineChange: onchange, valueElement:undefined}); jscolorL = new window.jscolor(el,{onFineChange: onchange, valueElement:undefined});
jscolorL.show(); jscolorL.show();
var currentColor = boardJSON.color; var currentColor = boardJSON.color;
if (currentColor == undefined) { if (currentColor === undefined) {
currentColor = '' currentColor = '';
} }
jscolorL.fromString(currentColor); jscolorL.fromString(currentColor);
}, },
buttonClick: function (el, boardId) { buttonClick: function (el, boardId, e) {
e.stopPropagation(); e.stopPropagation();
if (framework.isReadOnly() || framework.isLocked()) { return; } if (framework.isReadOnly() || framework.isLocked()) { return; }
UI.confirm(Messages.kanban_deleteBoard, function (yes) { UI.confirm(Messages.kanban_deleteBoard, function (yes) {

1
www/kanban/jkanban.js
View File

@ -275,6 +275,7 @@
nodeItem.dragendfn = element.dragend; nodeItem.dragendfn = element.dragend;
nodeItem.dropfn = element.drop; nodeItem.dropfn = element.drop;
__onclickHandler(nodeItem); __onclickHandler(nodeItem);
__onColorClickHandler(nodeItem, "item");
board.appendChild(nodeItem); board.appendChild(nodeItem);
// send event that board has changed // send event that board has changed
self.onChange(); self.onChange();