Skip to content

Commit

Permalink
Merge pull request #2075 from nextcloud/backport/stable22/1771
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Jan 11, 2022
2 parents 83d970a + fc9398c commit f1c06ff
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 11 deletions.
4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/files.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/public.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer.js.map

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/EditorFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
CodeBlockHighlight,
HorizontalRule,
History,
TrailingNode,
Placeholder,
} from 'tiptap-extensions'
import { Strong, Italic, Strike, Link } from './marks'
Expand Down Expand Up @@ -103,6 +104,10 @@ const createEditor = ({ content, onInit, onUpdate, extensions, enableRichEditing
extensions: [
...richEditingExtensions,
new History(),
new TrailingNode({
node: 'paragraph',
notAfter: ['paragraph'],
}),
].concat(extensions),
useBuiltInExtensions: enableRichEditing,
})
Expand Down

0 comments on commit f1c06ff

Please sign in to comment.