+
+export interface BottomAction {
+ title: string
+ action: () => void,
+}
diff --git a/src/components/input/editorConfig.ts b/src/components/input/editorConfig.ts
deleted file mode 100644
index e50e9aecc..000000000
--- a/src/components/input/editorConfig.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import EasyMDE from 'easymde'
-import {i18n} from '@/i18n'
-
-export function createEasyMDEConfig({ placeholder, uploadImage, imageUploadFunction }) {
- return {
- autoDownloadFontAwesome: false,
- spellChecker: false,
- placeholder,
- uploadImage,
- imageUploadFunction,
- minHeight: '150px',
- sideBySideFullscreen: false,
- toolbar: [
- {
- name: 'heading-1',
- action: EasyMDE.toggleHeading1,
- title: i18n.global.t('input.editor.heading1'),
- icon: '',
- },
- {
- name: 'heading-2',
- action: EasyMDE.toggleHeading2,
- title: i18n.global.t('input.editor.heading2'),
- icon: '',
- },
- {
- name: 'heading-3',
- action: EasyMDE.toggleHeading3,
- title: i18n.global.t('input.editor.heading3'),
- icon: '',
- },
- {
- name: 'heading-smaller',
- action: EasyMDE.toggleHeadingSmaller,
- title: i18n.global.t('input.editor.headingSmaller'),
- icon: '',
- },
- {
- name: 'heading-bigger',
- action: EasyMDE.toggleHeadingBigger,
- title: i18n.global.t('input.editor.headingBigger'),
- icon: '',
- },
- '|',
- {
- name: 'bold',
- action: EasyMDE.toggleBold,
- title: i18n.global.t('input.editor.bold'),
- icon: '',
- },
- {
- name: 'italic',
- action: EasyMDE.toggleItalic,
- title: i18n.global.t('input.editor.italic'),
- icon: '',
- },
- {
- name: 'strikethrough',
- action: EasyMDE.toggleStrikethrough,
- title: i18n.global.t('input.editor.strikethrough'),
- icon: '',
- },
- {
- name: 'code',
- action: EasyMDE.toggleCodeBlock,
- title: i18n.global.t('input.editor.code'),
- icon: '',
- },
- {
- name: 'quote',
- action: EasyMDE.toggleBlockquote,
- title: i18n.global.t('input.editor.quote'),
- icon: '',
- },
- {
- name: 'unordered-list',
- action: EasyMDE.toggleUnorderedList,
- title: i18n.global.t('input.editor.unorderedList'),
- icon: '',
- },
- {
- name: 'ordered-list',
- action: EasyMDE.toggleOrderedList,
- title: i18n.global.t('input.editor.orderedList'),
- icon: '',
- },
- '|',
- {
- name: 'clean-block',
- action: EasyMDE.cleanBlock,
- title: i18n.global.t('input.editor.cleanBlock'),
- icon: '',
- },
- {
- name: 'link',
- action: EasyMDE.drawLink,
- title: i18n.global.t('input.editor.link'),
- icon: '',
- },
- {
- name: 'image',
- action: EasyMDE.drawImage,
- title: i18n.global.t('input.editor.image'),
- icon: '',
- },
- {
- name: 'table',
- action: EasyMDE.drawTable,
- title: i18n.global.t('input.editor.table'),
- icon: '',
- },
- {
- name: 'horizontal-rule',
- action: EasyMDE.drawHorizontalRule,
- title: i18n.global.t('input.editor.horizontalRule'),
- icon: '',
- },
- '|',
- {
- name: 'side-by-side',
- action: EasyMDE.toggleSideBySide,
- title: i18n.global.t('input.editor.sideBySide'),
- icon: '',
- },
- {
- name: 'guide',
- action() {
- window.open('https://www.markdownguide.org/basic-syntax/', '_blank')
- },
- title: i18n.global.t('input.editor.guide'),
- icon: '',
- },
- ],
- }
-}
\ No newline at end of file
diff --git a/src/components/input/vue-easymde.vue b/src/components/input/vue-easymde.vue
deleted file mode 100644
index 208c3da5f..000000000
--- a/src/components/input/vue-easymde.vue
+++ /dev/null
@@ -1,522 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/misc/Icon.ts b/src/components/misc/Icon.ts
index b3ea6bdc3..d50e3953d 100644
--- a/src/components/misc/Icon.ts
+++ b/src/components/misc/Icon.ts
@@ -6,6 +6,10 @@ import {
faArchive,
faArrowLeft,
faArrowUpFromBracket,
+ faBold,
+ faItalic,
+ faStrikethrough,
+ faCode,
faBars,
faBell,
faBolt,
@@ -29,6 +33,7 @@ import {
faFilter,
faForward,
faGripLines,
+ faHeader,
faHistory,
faImage,
faKeyboard,
@@ -59,14 +64,26 @@ import {
faTimes,
faTrashAlt,
faUser,
- faUsers, faX,
+ faUsers,
+ faQuoteRight,
+ faListUl,
+ faLink,
+ faUndo,
+ faRedo,
+ faUnlink,
+ faParagraph,
+ faTable,
+ faX, faArrowTurnDown, faListCheck, faXmark, faXmarksLines, faFont, faRulerHorizontal, faUnderline,
} from '@fortawesome/free-solid-svg-icons'
import {
faBellSlash,
faCalendarAlt,
+ faCheckSquare,
faClock,
faComments,
+ faFileImage,
faSave,
+ faSquareCheck,
faStar,
faSun,
faTimesCircle,
@@ -76,6 +93,21 @@ import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome'
import type {FontAwesomeIcon as FontAwesomeIconFixedTypes} from '@/types/vue-fontawesome'
+library.add(faBold)
+library.add(faUndo)
+library.add(faRedo)
+library.add(faItalic)
+library.add(faLink)
+library.add(faUnlink)
+library.add(faParagraph)
+library.add(faSquareCheck)
+library.add(faTable)
+library.add(faFileImage)
+library.add(faCheckSquare)
+library.add(faStrikethrough)
+library.add(faCode)
+library.add(faQuoteRight)
+library.add(faListUl)
library.add(faAlignLeft)
library.add(faAngleRight)
library.add(faArchive)
@@ -107,6 +139,7 @@ library.add(faFillDrip)
library.add(faFilter)
library.add(faForward)
library.add(faGripLines)
+library.add(faHeader)
library.add(faHistory)
library.add(faImage)
library.add(faKeyboard)
@@ -146,6 +179,13 @@ library.add(faArrowUpFromBracket)
library.add(faX)
library.add(faAnglesUp)
library.add(faBolt)
+library.add(faArrowTurnDown)
+library.add(faListCheck)
+library.add(faXmark)
+library.add(faXmarksLines)
+library.add(faFont)
+library.add(faRulerHorizontal)
+library.add(faUnderline)
// overwriting the wrong types
export default FontAwesomeIcon as unknown as FontAwesomeIconFixedTypes
\ No newline at end of file
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 95814a965..3af156544 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -66,7 +66,6 @@
@@ -114,12 +114,12 @@
taskCommentService.loading &&
!isCommentEdit,
}"
- :hasPreview="false"
:upload-callback="attachmentUpload"
:upload-enabled="true"
:placeholder="$t('task.comment.placeholder')"
v-if="editorActive"
v-model="newComment.comment"
+ @save="addComment()"
/>
diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue
index c1ceedcba..120144610 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -18,21 +18,20 @@
diff --git a/src/helpers/checklistFromText.test.ts b/src/helpers/checklistFromText.test.ts
index 6b0fd54af..f01b712bb 100644
--- a/src/helpers/checklistFromText.test.ts
+++ b/src/helpers/checklistFromText.test.ts
@@ -10,48 +10,56 @@ describe('Find checklists in text', () => {
expect(checkboxes).toHaveLength(0)
})
it('should find multiple checkboxes', () => {
- const text: string = `* [ ] Lorem Ipsum
-* [ ] Dolor sit amet
-
-Here's some text in between
-
-* [x] Dolor sit amet
-- [ ] Dolor sit amet`
+ const text: string = `
+`
const checkboxes = findCheckboxesInText(text)
expect(checkboxes).toHaveLength(4)
- expect(checkboxes[0]).toBe(0)
- expect(checkboxes[1]).toBe(18)
- expect(checkboxes[2]).toBe(69)
- expect(checkboxes[3]).toBe(90)
+ expect(checkboxes[0]).toBe(32)
+ expect(checkboxes[1]).toBe(163)
+ expect(checkboxes[2]).toBe(321)
+ expect(checkboxes[3]).toBe(464)
})
- it('should find one checkbox with *', () => {
- const text: string = '* [ ] Lorem Ipsum'
+ it('should find one unchecked checkbox', () => {
+ const text: string = `
+`
const checkboxes = findCheckboxesInText(text)
expect(checkboxes).toHaveLength(1)
- expect(checkboxes[0]).toBe(0)
+ expect(checkboxes[0]).toBe(32)
})
- it('should find one checkbox with -', () => {
- const text: string = '- [ ] Lorem Ipsum'
+ it('should find one checked checkbox', () => {
+ const text: string = `
+`
const checkboxes = findCheckboxesInText(text)
expect(checkboxes).toHaveLength(1)
- expect(checkboxes[0]).toBe(0)
- })
- it('should find one checked checkbox with *', () => {
- const text: string = '* [x] Lorem Ipsum'
- const checkboxes = findCheckboxesInText(text)
-
- expect(checkboxes).toHaveLength(1)
- expect(checkboxes[0]).toBe(0)
- })
- it('should find one checked checkbox with -', () => {
- const text: string = '- [x] Lorem Ipsum'
- const checkboxes = findCheckboxesInText(text)
-
- expect(checkboxes).toHaveLength(1)
- expect(checkboxes[0]).toBe(0)
+ expect(checkboxes[0]).toBe(32)
})
})
@@ -63,32 +71,60 @@ describe('Get Checklist Statistics in a Text', () => {
expect(stats.total).toBe(0)
})
it('should find one checkbox', () => {
- const text: string = '* [ ] Lorem Ipsum'
+ const text: string = `
+`
const stats = getChecklistStatistics(text)
expect(stats.total).toBe(1)
expect(stats.checked).toBe(0)
})
it('should find one checked checkbox', () => {
- const text: string = '* [x] Lorem Ipsum'
+ const text: string = `
+`
const stats = getChecklistStatistics(text)
expect(stats.total).toBe(1)
expect(stats.checked).toBe(1)
})
it('should find multiple mixed and matched', () => {
- const text: string = `* [ ] Lorem Ipsum
-* [ ] Dolor sit amet
-* [x] Dolor sit amet
-- [x] Dolor sit amet
+ const text: string = `
+`
-Here's some text in between
-
-* [x] Dolor sit amet
-- [ ] Dolor sit amet`
const stats = getChecklistStatistics(text)
expect(stats.total).toBe(6)
- expect(stats.checked).toBe(3)
+ expect(stats.checked).toBe(2)
})
})
diff --git a/src/helpers/checklistFromText.ts b/src/helpers/checklistFromText.ts
index 65294842a..162b94a3b 100644
--- a/src/helpers/checklistFromText.ts
+++ b/src/helpers/checklistFromText.ts
@@ -1,5 +1,3 @@
-const checked = '[x]'
-
interface CheckboxStatistics {
total: number
checked: number
@@ -11,7 +9,7 @@ interface MatchedCheckboxes {
}
const getCheckboxesInText = (text: string): MatchedCheckboxes => {
- const regex = /[*-] \[[ x]]/g
+ const regex = /data-checked="(true|false)"/g
let match
const checkboxes: MatchedCheckboxes = {
checked: [],
@@ -19,7 +17,7 @@ const getCheckboxesInText = (text: string): MatchedCheckboxes => {
}
while ((match = regex.exec(text)) !== null) {
- if (match[0].endsWith(checked)) {
+ if (match[1] === 'true') {
checkboxes.checked.push(match.index)
} else {
checkboxes.unchecked.push(match.index)
diff --git a/src/helpers/markdownRenderer.ts b/src/helpers/markdownRenderer.ts
deleted file mode 100644
index 2c3993534..000000000
--- a/src/helpers/markdownRenderer.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {marked} from 'marked'
-import hljs from 'highlight.js/lib/common'
-
-export function setupMarkdownRenderer(checkboxId: string) {
- const renderer = new marked.Renderer()
- const linkRenderer = renderer.link
-
- let checkboxNum = -1
- marked.use({
- renderer: {
- image(src: string, title: string, text: string) {
-
- title = title ? ` title="${title}` : ''
-
- // If the url starts with the api url, the image is likely an attachment and
- // we'll need to download and parse it properly.
- if (src.slice(0, window.API_URL.length + 7) === `${window.API_URL}/tasks/`) {
- return `![${text}]()
`
- }
-
- return `
`
- },
- checkbox(checked: boolean) {
- let checkedString = ''
- if (checked) {
- checkedString = 'checked'
- }
-
- checkboxNum++
- return ``
- },
- link(href: string, title: string, text: string) {
- const isLocal = href.startsWith(`${location.protocol}//${location.hostname}`)
- const html = linkRenderer.call(renderer, href, title, text)
- return isLocal ? html : html.replace(/^
diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue
index 56b083ce3..111476d1e 100644
--- a/src/views/labels/ListLabels.vue
+++ b/src/views/labels/ListLabels.vue
@@ -58,7 +58,6 @@
import {computed} from 'vue'
-import {setupMarkdownRenderer} from '@/helpers/markdownRenderer'
-import {marked} from 'marked'
import DOMPurify from 'dompurify'
-import {createRandomID} from '@/helpers/randomId'
import {useProjectStore} from '@/stores/projects'
const props = defineProps({
@@ -36,7 +33,6 @@ const htmlDescription = computed(() => {
return ''
}
- setupMarkdownRenderer(createRandomID())
- return DOMPurify.sanitize(marked(description), {ADD_ATTR: ['target']})
+ return DOMPurify.sanitize(description, {ADD_ATTR: ['target']})
})
diff --git a/src/views/project/settings/edit.vue b/src/views/project/settings/edit.vue
index 46c8916b7..595e1d96f 100644
--- a/src/views/project/settings/edit.vue
+++ b/src/views/project/settings/edit.vue
@@ -54,7 +54,6 @@