Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
--text-editor-max-width: 670px
}

.modal-container #editor-container {
.modal-container .text-editor {
position: absolute;
}

Expand All @@ -31,7 +31,7 @@ li.ProseMirror-selectednode:after {
}

.has-conflicts,
#editor-wrapper.icon-loading {
.text-editor__wrapper.icon-loading {
.ProseMirror-menubar {
display: none;
}
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/attachments.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const checkAttachment = (documentId, fileName, fileId, index, isImage = true) =>

cy.log('Check the attachment is visible and well formed', documentId, fileName, fileId, index, encodedName)
return new Cypress.Promise((resolve, reject) => {
cy.get(`#editor [data-component="image-view"][data-src="${src}"]`)
cy.get(`.text-editor__main [data-component="image-view"][data-src="${src}"]`)
.find('.image__view') // wait for load finish
.within(($el) => {
// keep track that we have created this attachment in the attachment dir
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/conflict.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const randUser = randHash()
const fileName = 'test.md'

describe('Open test.md in viewer', function() {
const getWrapper = () => cy.get('#editor-wrapper.has-conflicts.is-rich-editor')
const getWrapper = () => cy.get('.text-editor__wrapper.has-conflicts.is-rich-editor')

before(() => {
initUserAndFiles(randUser, fileName)
Expand All @@ -47,12 +47,12 @@ describe('Open test.md in viewer', function() {
cy.get('#viewer .modal-header button.header-close').click()
cy.get('#viewer').should('not.exist')
cy.openFile('test.md')
cy.get('#editor-container .document-status .icon-error')
cy.get('.text-editor .document-status .icon-error')
getWrapper()
.get('#read-only-editor h2')
.should('contain', 'Hello world')
getWrapper()
.get('#editor h2')
.get('.text-editor__main h2')
.should('contain', 'Hello world')
cy.screenshot()
})
Expand Down
4 changes: 2 additions & 2 deletions js/editor-rich.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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/files-modal.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.

2 changes: 1 addition & 1 deletion src/components/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
-->

<template>
<div id="editor-container" data-text-el="editor-container" class="text-editor">
<div data-text-el="editor-container" class="text-editor">
<DocumentStatus v-if="displayed"
:idle="idle"
:lock="lock"
Expand Down
3 changes: 1 addition & 2 deletions src/components/Editor/MainContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
-->

<template>
<MediaHandler id="editor"
class="text-editor__main">
<MediaHandler class="text-editor__main">
<slot />
</MediaHandler>
</template>
Expand Down
3 changes: 1 addition & 2 deletions src/components/Editor/Wrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
-->

<template>
<div id="editor-wrapper"
class="text-editor__wrapper"
<div class="text-editor__wrapper"
:class="{
'has-conflicts': hasSyncCollission,
'icon-loading': !contentLoaded && !hasConnectionIssue,
Expand Down
2 changes: 1 addition & 1 deletion src/views/RichWorkspace.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export default {
},
focus(newValue) {
if (!newValue) {
document.querySelector('#editor').scrollTo(0, 0)
document.querySelector('#rich-workspace .text-editor__main').scrollTo(0, 0)
}
},
},
Expand Down