diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 07209aeed..d0a38d10a 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -26,7 +26,6 @@ define([ '/kanban/jkanban.js', - '/common/jscolor.js', 'css!/kanban/jkanban.css', 'less!/kanban/app-kanban.less' ], function ( @@ -66,9 +65,6 @@ define([ // use cursor channel to tell others what you are editing // add outline + warning inside the modal? -// XXX -// Fix contrast on migrated card (squad kanban green cards) - var setValueAndCursor = function (input, val, _cursor) { if (!input) { return; } var $input = $(input); @@ -586,54 +582,6 @@ define([ framework.localChange(); }); }, - colorClick: function (el, type) { - if (framework.isReadOnly() || framework.isLocked()) { return; } - verbose("on color click"); - var boardJSON; - var board; - if (type === "board") { - verbose("board color click"); - board = $(el.parentNode).attr("data-id"); - boardJSON = kanban.getBoardJSON(board); - } else { - verbose("item color click"); - board = $(el.parentNode.parentNode).attr("data-id"); - var pos = kanban.findElementPosition(el); - boardJSON = kanban.getBoardJSON(board).item[pos]; - } - var onchange = function (colorL) { - var elL = el; - var typeL = type; - var boardJSONL; - var boardL; - if (typeL === "board") { - verbose("board color change"); - boardL = $(elL.parentNode).attr("data-id"); - boardJSONL = kanban.getBoardJSON(boardL); - } else { - verbose("item color change"); - boardL = $(elL.parentNode.parentNode).attr("data-id"); - var pos = kanban.findElementPosition(elL); - boardJSONL = kanban.getBoardJSON(boardL).item[pos]; - } - var currentColor = boardJSONL.color; - verbose("Current color " + currentColor); - if (currentColor !== colorL.toString()) { - $(elL).removeClass("kanban-header-" + currentColor); - boardJSONL.color = colorL.toString(); - kanban.onChange(); - } - }; - var jscolorL; - el._jscLinkedInstance = undefined; - jscolorL = new window.jscolor(el,{showOnClick: false, onFineChange: onchange, valueElement:undefined}); - jscolorL.show(); - var currentColor = boardJSON.color; - if (currentColor === undefined) { - currentColor = ''; - } - jscolorL.fromString(currentColor); - }, addItemClick: function (el) { if (framework.isReadOnly() || framework.isLocked()) { return; } if (kanban.inEditMode) { diff --git a/www/kanban/jkanban.js b/www/kanban/jkanban.js index 45cb6a0a8..a1cd191f2 100644 --- a/www/kanban/jkanban.js +++ b/www/kanban/jkanban.js @@ -69,8 +69,6 @@ dropBoard: function (el, target, source, sibling) {}, click: function (el) {}, boardTitleclick: function (el, boardId) {}, - buttonClick: function (el, boardId) {}, - colorClick: function (el, type) {}, addItemClick: function (el, boardId) {}, renderMd: function (md) {}, refresh: function () {}, @@ -85,20 +83,22 @@ // set initial boards __setBoard(); - var $el = $(self.element) - var $inner = $el.find('.kanban-container'); - var leftRegion = $el.position().left + 10; - var rightRegion = $(window).width() - 10; - var onMouseMove = function (e) { - if (e.which !== 1) { return; } // left click - var distance = 20; - if (e.pageX < leftRegion) { - distance *= -1; - $el.scrollLeft(distance + $el.scrollLeft()) ; - } else if (e.pageX >= rightRegion) { - $el.scrollLeft(distance + $el.scrollLeft()) ; - } - }; + // Scroll on drag + var $el = $(self.element) + var $inner = $el.find('.kanban-container'); + var leftRegion = $el.position().left + 10; + var rightRegion = $(window).width() - 10; + var onMouseMove = function (e) { + if (e.which !== 1) { return; } // left click + var distance = 20; + if (e.pageX < leftRegion) { + distance *= -1; + $el.scrollLeft(distance + $el.scrollLeft()) ; + } else if (e.pageX >= rightRegion) { + $el.scrollLeft(distance + $el.scrollLeft()) ; + } + }; + //set drag with dragula if (window.innerWidth > self.options.responsive) { @@ -333,7 +333,7 @@ var r = parseInt(hex.slice(0,2), 16); var g = parseInt(hex.slice(2,4), 16); var b = parseInt(hex.slice(4,6), 16); - if ((r*0.299 + g*0.587 + b*0.114) > 186) { + if ((r*0.213 + g*0.715 + b*0.072) > 255/2) { return '#000000'; } return '#FFFFFF'; @@ -394,7 +394,6 @@ nodeItem.dragendfn = element.dragend; nodeItem.dropfn = element.drop; __onclickHandler(nodeItemText); - //__onColorClickHandler(nodeItem, "item"); return nodeItem; }; @@ -601,11 +600,6 @@ return self; } - // board button on click function - this.onButtonClick = function (el) { - - } - this.renderMd = function (md) { return self.options.renderMd(md); } @@ -687,17 +681,6 @@ }); } - function __onColorClickHandler(nodeItem, type) { - nodeItem.addEventListener('click', function (e) { - if (Array.prototype.slice.call(nodeItem.classList).indexOf('is-moving') !== -1) { - return; - } - e.preventDefault; - e.stopPropagation(); - self.options.colorClick(this, type); - }); - } - function __onAddItemClickHandler(nodeItem, clickfn) { nodeItem.addEventListener('click', function (e) { e.preventDefault; @@ -708,16 +691,6 @@ }); } - function __onButtonClickHandler(nodeItem, boardId) { - nodeItem.addEventListener('click', function (e) { - e.stopPropagation(); - e.preventDefault; - self.options.buttonClick(this, boardId, e); - // if(typeof(this.clickfn) === 'function') - // this.clickfn(this); - }); - } - function __findBoardJSON(id) { return (self.options.boards.data || {})[id]; }