Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Added coloured label badges in autocomplete list

Browse source
This commit is contained in:
Kenton Hamaluik 2015-10-08 13:10:46 -06:00
parent f5be121cf3
commit fde2a39ee3
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/components/forms/forms.styl
View file

@ -617,6 +617,13 @@ button
margin-right: 5px margin-right: 5px
vertical-align: middle vertical-align: middle
.minicard-label
width: 11px
height: @width
border-radius: 2px
margin-right: 3px
display: inline-block
&.active &.active
background: #005377 background: #005377

19
client/components/lists/listBody.js
View file

@ -34,7 +34,7 @@ BlazeComponent.extendComponent({
} else if (position === 'bottom') { } else if (position === 'bottom') {
sortIndex = Utils.calculateIndex(lastCardDom, null).base; sortIndex = Utils.calculateIndex(lastCardDom, null).base;
} }
// Parse for @user and #label mentions, stripping them from the title // Parse for @user and #label mentions, stripping them from the title
// and applying the appropriate users and labels to the card instead. // and applying the appropriate users and labels to the card instead.
const currentBoard = Boards.findOne(Session.get('currentBoard')); const currentBoard = Boards.findOne(Session.get('currentBoard'));
@ -182,12 +182,12 @@ BlazeComponent.extendComponent({
onRendered() { onRendered() {
const $textarea = this.$('textarea'); const $textarea = this.$('textarea');
const currentBoard = Boards.findOne(Session.get('currentBoard'));
$textarea.textcomplete([ $textarea.textcomplete([
// User mentions // User mentions
{ {
match: /\B@(\w*)$/, match: /\B@(\w*)$/,
search(term, callback) { search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
callback($.map(currentBoard.members, (member) => { callback($.map(currentBoard.members, (member) => {
const username = Users.findOne(member.userId).username; const username = Users.findOne(member.userId).username;
return username.indexOf(term) === 0 ? username : null; return username.indexOf(term) === 0 ? username : null;
@ -206,14 +206,23 @@ BlazeComponent.extendComponent({
{ {
match: /\B#(\w*)$/, match: /\B#(\w*)$/,
search(term, callback) { search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
callback($.map(currentBoard.labels, (label) => { callback($.map(currentBoard.labels, (label) => {
const labelName = (!label.name || label.name === '') ? label.color : label.name; const labelName = (!label.name || label.name === '')
? label.color
: label.name;
return labelName.indexOf(term) === 0 ? labelName : null; return labelName.indexOf(term) === 0 ? labelName : null;
})); }));
}, },
template(value) { template(value) {
return value; // add a "colour badge" in front of the label name
// but first, get the colour's name from its value
const colorName = currentBoard.labels.find((label) => {
return value === label.name || value === label.color;
}).color;
return (colorName && colorName !== '')
? `<div class="minicard-label card-label-${colorName}"
title="${value}"></div> ${value}`
: value;
}, },
replace(label) { replace(label) {
return `#${label} `; return `#${label} `;