vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

fix: task default color should be set and evaluated properly
continuous-integration/drone/push Build is failing Details

This commit is contained in:
kolaente 2022-06-16 18:11:42 +02:00
parent 7ef0d8c4ea
commit 37c36560fb
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/tasks/partials/kanban-card.vue
View File

@ -4,9 +4,9 @@
:class="{
'is-loading': loadingInternal || loading,
'draggable': !(loadingInternal || loading),
'has-light-text': !colorIsDark(task.hexColor) && task.hexColor !== `#${task.defaultColor}` && task.hexColor !== task.defaultColor,
'has-light-text': task.getHexColor() !== TASK_DEFAULT_COLOR && !colorIsDark(task.getHexColor()),
}"
:style="{'background-color': task.hexColor !== '#' && task.hexColor !== `#${task.defaultColor}` ? task.hexColor : false}"
:style="{'background-color': task.hexColor !== '#' && task.hexColor !== '' ? task.hexColor : false}"
@click.exact="openTaskDetail()"
@click.ctrl="() => toggleTaskDone(task)"
@click.meta="() => toggleTaskDone(task)"
@ -74,6 +74,7 @@ import User from '../../../components/misc/user'
import Done from '@/components/misc/Done.vue'
import Labels from '../../../components/tasks/partials/labels'
import ChecklistSummary from './checklist-summary'
import {TASK_DEFAULT_COLOR} from '@/models/task'
import {colorIsDark} from '@/helpers/color/colorIsDark'
@ -89,6 +90,7 @@ export default defineComponent({
data() {
return {
loadingInternal: false,
TASK_DEFAULT_COLOR,
}
},
props: {

5
src/models/task.ts
View File

@ -8,6 +8,7 @@ import SubscriptionModel from '@/models/subscription'
import {parseDateOrNull} from '@/helpers/parseDateOrNull'
const SUPPORTS_TRIGGERED_NOTIFICATION = 'Notification' in window && 'showTrigger' in Notification.prototype
export const TASK_DEFAULT_COLOR = '#1973ff'
export default class TaskModel extends AbstractModel {
constructor(data) {
@ -187,8 +188,8 @@ export default class TaskModel extends AbstractModel {
}
getHexColor() {
if (this.hexColor === '') {
return `#${this.defaultColor}`
if (this.hexColor === '' || this.hexColor === '#') {
return TASK_DEFAULT_COLOR
}
return this.hexColor