Skip to content

Commit

Permalink
Bring back menubar without formatting on plain text mode
Browse files Browse the repository at this point in the history
Signed-off-by: Julius Härtl <jus@bitgrid.net>
  • Loading branch information
juliusknorr committed Jul 27, 2022
1 parent 9adc0e0 commit 5f05fb1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
"@nextcloud/eslint-config": "^8.0.0",
"@nextcloud/stylelint-config": "^2.1.2",
"@nextcloud/webpack-vue-config": "^5.2.1",
"@vitejs/plugin-vue2": "^1.1.2",
"@vue/test-utils": "^1.3.0",
"@vue/vue2-jest": "^28.0.1",
"cypress": "^10.3.0",
Expand All @@ -124,7 +125,6 @@
"mitt": "^3.0.0",
"vite": "^3.0.2",
"vite-plugin-commonjs": "^0.5.0",
"@vitejs/plugin-vue2": "^1.1.2",
"vue-demi": "^0.13.5",
"vue-template-compiler": "^2.7.8"
},
Expand Down
1 change: 0 additions & 1 deletion src/components/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ export default {
},
renderMenus() {
return this.contentLoaded
&& this.isRichEditor
&& !this.syncError
&& !this.readOnly
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/Menu/MenuBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export default {
clearInterval(this.$checkInterval)
}

if (isWidthAvailable) {
if (isWidthAvailable || !this.$isRichEditor) {
this.$nextTick(() => {
this.isReady = true
})
Expand Down

0 comments on commit 5f05fb1

Please sign in to comment.