Skip to content

Commit

Permalink
Merge pull request #2076 from nextcloud/backport/stable22/1916
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Jan 11, 2022
2 parents f1c06ff + 44a5f30 commit f077ce0
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 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.

10 changes: 5 additions & 5 deletions 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.

8 changes: 4 additions & 4 deletions src/EditorFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ const createEditor = ({ content, onInit, onUpdate, extensions, enableRichEditing
emptyNodeText: t('text', 'Add notes, lists or links …'),
showOnlyWhenEditable: true,
}),
new TrailingNode({
node: 'paragraph',
notAfter: ['paragraph'],
}),
]
} else {
richEditingExtensions = [
Expand All @@ -104,10 +108,6 @@ 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 f077ce0

Please sign in to comment.