Merge pull request #3437 from nextcloud/backport/2757/stable25

[stable25] Bring back menubar without formatting on plain text mode
nextcloud · Nov 16, 2022 · 606a652 · 606a652
2 parents 6d99fc9 + 66a67e0
commit 606a652
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 31 deletions.
diff --git a/js/editor-collab.js b/js/editor-collab.js
diff --git a/js/editor-collab.js.map b/js/editor-collab.js.map
diff --git a/js/editor-rich.js b/js/editor-rich.js
diff --git a/js/editor-rich.js.map b/js/editor-rich.js.map
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
@@ -36,7 +36,14 @@
 			<MainContainer v-if="$editor">
 				<!-- Readonly -->
 				<div v-if="readOnly" class="text-editor--readonly-bar">
-					<ReadonlyBar />
+					<ReadonlyBar>
+						<Status :document="document"
+							:dirty="dirty"
+							:sessions="filteredSessions"
+							:sync-error="syncError"
+							:has-connection-issue="hasConnectionIssue"
+							:last-saved-string="lastSavedString" />
+					</ReadonlyBar>
 				</div>
 				<!-- Rich Menu -->
 				<template v-else>
@@ -266,12 +273,16 @@ export default {
 		displayed() {
 			return this.currentSession && this.active
 		},
-		renderMenus() {
+		renderRichEditorMenus() {
 			return this.contentLoaded
 				&& this.isRichEditor
 				&& !this.syncError
 				&& !this.readOnly
 		},
+		renderMenus() {
+			return this.contentLoaded
+				&& !this.syncError
+		},
 		imagePath() {
 			return this.relativePath.split('/').slice(0, -1).join('/')
 		},

diff --git a/src/components/Editor/SessionList.vue b/src/components/Editor/SessionList.vue
@@ -144,10 +144,6 @@ export default {
 		display: inline-flex;
 		flex-direction: row-reverse;
 
-		&:focus {
-			background-color: #eee;
-		}
-
 		.avatar-wrapper {
 			margin: 0 -18px 0 0;
 			z-index: 1;

diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue
@@ -184,7 +184,7 @@ export default {
 				clearInterval(this.$checkInterval)
 			}
 
-			if (isWidthAvailable) {
+			if (isWidthAvailable || !this.$isRichEditor) {
 				this.$nextTick(() => {
 					this.isReady = true
 				})

diff --git a/src/components/Menu/ReadonlyBar.vue b/src/components/Menu/ReadonlyBar.vue
@@ -8,6 +8,9 @@
 				v-bind="{ actionEntry }"
 				:key="`text-action--${actionEntry.key}`" />
 		</div>
+		<div class="text-menubar__slot">
+			<slot />
+		</div>
 	</div>
 </template>
 
@@ -28,6 +31,9 @@ export default defineComponent({
 </script>
 
 <style scoped>
+.text-readonly-bar {
+	display: flex;
+}
 .text-readonly-bar__entries {
 	display: flex;
 	flex-grow: 1;