diff options
| author | Vinicius Reis <vinicius.reis@nextcloud.com> | 2022-06-20 15:52:30 +0300 |
|---|---|---|
| committer | Vinicius Reis <vinicius.reis@nextcloud.com> | 2022-06-20 15:52:30 +0300 |
| commit | bff504179291b12228ead3ba565475f3f958660a (patch) | |
| tree | c48acf75afdc20e778cf3d834554ba11f4818c59 /src | |
| parent | eaf6ecdd2565e95345eca20a355118c79175196e (diff) | |
| parent | 0f961fc98ba26d986a18dd8a954f1d4c825a9335 (diff) | |
Merge branch 'master' of github.com:nextcloud/text into fix/formatting-help
Diffstat (limited to 'src')
| -rw-r--r-- | src/EditorFactory.js | 2 | ||||
| -rw-r--r-- | src/components/HelpModal.vue | 2 | ||||
| -rw-r--r-- | src/components/Menu/entries.js | 2 | ||||
| -rw-r--r-- | src/extensions/PlainText.js | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/EditorFactory.js b/src/EditorFactory.js index ccc61d952..54424c78d 100644 --- a/src/EditorFactory.js +++ b/src/EditorFactory.js @@ -21,7 +21,6 @@ */ /* eslint-disable import/no-named-as-default */ -import Dropcursor from '@tiptap/extension-dropcursor' import History from '@tiptap/extension-history' import Placeholder from '@tiptap/extension-placeholder' /* eslint-enable import/no-named-as-default */ @@ -116,7 +115,6 @@ const createEditor = ({ content, onCreate, onUpdate, extensions, enableRichEditi placeholder: t('text', 'Add notes, lists or links …'), showOnlyWhenEditable: true, }), - Dropcursor, TrailingNode, ] } else { diff --git a/src/components/HelpModal.vue b/src/components/HelpModal.vue index a5fd44c3c..7f9bf9f45 100644 --- a/src/components/HelpModal.vue +++ b/src/components/HelpModal.vue @@ -130,7 +130,7 @@ <tr> <td>{{ t('text', 'Checklist') }}</td> <td> - <code>* [] {{ t('text', 'Todo item') }}</code> + <code>* [] {{ t('text', 'To-Do item') }}</code> </td> <td v-if="!isMobile" /> </tr> diff --git a/src/components/Menu/entries.js b/src/components/Menu/entries.js index 40f4ccce2..9af3dd04a 100644 --- a/src/components/Menu/entries.js +++ b/src/components/Menu/entries.js @@ -209,7 +209,7 @@ export default [ }, { key: 'task-list', - label: t('text', 'ToDo list'), + label: t('text', 'To-Do list'), isActive: 'taskList', icon: FormatListCheckbox, action: (command) => command.toggleTaskList(), diff --git a/src/extensions/PlainText.js b/src/extensions/PlainText.js index 9691f8517..1236ec394 100644 --- a/src/extensions/PlainText.js +++ b/src/extensions/PlainText.js @@ -27,6 +27,8 @@ import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight' import Text from '@tiptap/extension-text' /* eslint-enable import/no-named-as-default */ +import lowlight from 'lowlight/lib/core' + import PlainTextDocument from './../nodes/PlainTextDocument.js' export default Extension.create({ @@ -36,7 +38,7 @@ export default Extension.create({ return [ PlainTextDocument, Text, - CodeBlockLowlight, + CodeBlockLowlight.configure({ lowlight }), ] }, |