Skip to content

Commit

Permalink
tmp debug
Browse files Browse the repository at this point in the history
Signed-off-by: Jonas <[email protected]>
  • Loading branch information
mejo- committed Nov 7, 2023
1 parent 8426c63 commit 004f480
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cypress/e2e/pages-links.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ describe('Page Link Handling', function() {
})
})

describe('Link handling to collectives', function() {
describe.only('Link handling to collectives', function() {
it('Opens link with URL to page in this collective in same/new tab depending on view/edit mode', function() {
const href = `${baseUrl}/index.php/apps/collectives/Link%20Testing/Link%20Target`
testLinkToSameTab(href)
Expand Down
15 changes: 9 additions & 6 deletions src/components/Page/TextEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ export default {
const editorPromise = this.setupEditor()
const pageContentPromise = this.getPageContent()
Promise.all([readerPromise, editorPromise, pageContentPromise]).then(() => {
this.$nextTick(() => {
this.initEditMode()
})
this.initEditMode()
})
this.textEditWatcher = this.$watch('isTextEdit', (val) => {
Expand Down Expand Up @@ -134,12 +132,17 @@ export default {
// for template pages
|| this.isTemplatePage
// for new pages
|| this.loading('newPageContent')
// or when page is empty
|| !this.pageContent?.trim()) {
|| this.loading('newPageContent')) {
this.setTextEdit()
this.done('newPageContent')
}
if (// or when page is empty
!this.davContent.trim()) {
this.setTextEdit()
this.done('newPageContent')
console.error('EEERROR, dav content empty', { pageId: this.currentPage.id, pageTitle: this.currentPage.title, davContent: this.davContent, pageContent: this.pageContent, loadingPageContent: this.loading('pageContent'), contentLoaded: this.contentLoaded })
}
},
stopEdit() {
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/editorMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export default {
},
onUpdate: ({ markdown }) => {
this.editorContent = markdown
this.reader?.setContent(this.pageContent)
this.reader?.setContent(this.editorContent)
},
onOutlineToggle: (visible) => {
this.toggleOutlineFromEditor(visible)
Expand Down

0 comments on commit 004f480

Please sign in to comment.