Merge pull request #3475 from nextcloud/backport/2757/stable24

[stable24] Bring back menubar without formatting on plain text mode
nextcloud · Nov 23, 2022 · a8dda86 · a8dda86
2 parents 877e32d + 7eb43fd
commit a8dda86
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 31 deletions.
diff --git a/cypress/integration/files.spec.js b/cypress/integration/files.spec.js
@@ -20,16 +20,25 @@
  *
  */
 
+import { randHash } from '../utils/'
+const randUser = randHash()
+
 describe('Files default view', function() {
-	beforeEach(function() {
-		cy.login('admin', 'admin')
+	before(function() {
+		cy.nextcloudCreateUser(randUser, 'password')
+		cy.login(randUser, 'password')
+		cy.createFile('textfile.txt', '', 'text/plain')
 	})
 
-	it('See the default files list', function() {
-		cy.get('#fileList tr').should('contain', 'welcome.txt')
+	beforeEach(function() {
+		cy.login(randUser, 'password')
 	})
 
-	it('Take screenshot', function() {
-		cy.screenshot()
+	it('opens plain text files', function() {
+		cy.get('#fileList tr').should('contain', 'textfile.txt')
+		cy.openFile('textfile.txt')
+		cy.get('.modal-title').should('contain', 'textfile.txt')
+		cy.get('#editor-session-list').should('contain', 'Saved')
 	})
+
 })
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/EditorWrapper.vue b/src/components/EditorWrapper.vue
@@ -48,6 +48,7 @@
 					ref="menubar"
 					:file-path="relativePath"
 					:file-id="fileId"
+					:is-read-only="readOnly"
 					:is-rich-editor="isRichEditor"
 					:is-public="isPublic"
 					:autohide="autohide"
@@ -68,7 +69,7 @@
 				</MenuBar>
 				<div v-if="!menubarLoaded" class="menubar placeholder" />
 				<div ref="contentWrapper" class="content-wrapper">
-					<MenuBubble v-if="renderMenus"
+					<MenuBubble v-if="renderRichEditorMenus"
 						:content-wrapper="contentWrapper"
 						:file-path="relativePath" />
 					<EditorContent v-show="contentLoaded"
@@ -291,12 +292,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
+		},
 	},
 	watch: {
 		lastSavedStatus() {

diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue
@@ -29,7 +29,7 @@
 			class="hidden-visually"
 			:multiple="true"
 			@change="onImageUploadFilePicked">
-		<div v-if="isRichEditor" ref="menubar" class="menubar-icons">
+		<div v-if="isRichEditor && !isReadOnly" ref="menubar" class="menubar-icons">
 			<template v-for="(icon) in icons">
 				<EmojiPicker v-if="icon.class === 'icon-emoji'"
 					v-show="icon.priority <= iconCount"
@@ -154,6 +154,10 @@ export default {
 		useEditorMixin,
 	],
 	props: {
+		isReadOnly: {
+			type: Boolean,
+			default: false,
+		},
 		isRichEditor: {
 			type: Boolean,
 			default: true,
@@ -189,7 +193,7 @@ export default {
 			submenuVisibility: {},
 			lastImagePath: null,
 			icons: [...menuBarIcons],
-			editorHasFocus: false
+			editorHasFocus: false,
 		}
 	},
 	computed: {