Skip to content

Commit

Permalink
Merge pull request #4718 from nextcloud/backport/stable23/2675
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Aug 29, 2023
2 parents 00a4456 + e0f5195 commit db482da
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 15 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.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/nodes/Image.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ export default class Image extends TiptapImage {
return {
...super.schema,
selectable: false,
// Avoid the prosemirror node creation to trigger image loading as we use a custom node view anyways
// Otherwise it would attempt to load the image from the current location before the node view is even initialized
toDOM: () => ['img'],
}
}

Expand Down

0 comments on commit db482da

Please sign in to comment.