Skip to content

Commit 5af4375

Browse files
Merge branch 'master' into feature/2440-improve-header-bar
2 parents c98246c + de4bdbf commit 5af4375

70 files changed

Lines changed: 311 additions & 336 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

β€Žcypress/integration/images.spec.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const checkImage = (documentId, imageName, imageId, index) => {
8282
cy.log('Check the image is visible and well formed', { documentId, imageName, imageId, index, encodedName })
8383
return new Cypress.Promise((resolve, reject) => {
8484
cy.get('#editor [data-component="image-view"]')
85-
.filter('[data-src="text://image?imageFileName=' + encodedName + '"]')
85+
.filter('[data-src=".attachments.' + documentId + '/' + encodedName + '"]')
8686
.find('.image__view') // wait for load finish
8787
.within(($el) => {
8888
// keep track that we have created this image in the attachment dir

β€Žjs/editor-rich.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjs/editor-rich.js.mapβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjs/editor.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjs/editor.js.mapβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjs/files-modal.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjs/files-modal.js.mapβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjs/text-files.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjs/text-files.js.mapβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjs/text-public.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)