Skip to content

[stable24] Bring back menubar without formatting on plain text mode #3475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-nextcloud merged 3 commits into from
Nov 23, 2022
Merged

[stable24] Bring back menubar without formatting on plain text mode #3475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b49f3e
fix: menubar without formatting on plain text mode
max-nextcloud Nov 23, 2022
40b53a7
test: opening text file with status bar
max-nextcloud Nov 23, 2022
7eb43fd
Compile assets
nextcloud-command Nov 23, 2022
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
21 changes: 15 additions & 6 deletions cypress/integration/files.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})

})
4 changes: 2 additions & 2 deletions js/editor-rich.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor-rich.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/editor.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/files-modal.js
View file
Open in desktop

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
View file
Open in desktop

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
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions src/components/EditorWrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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() {
Expand Down
8 changes: 6 additions & 2 deletions src/components/MenuBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -154,6 +154,10 @@ export default {
useEditorMixin,
],
props: {
isReadOnly: {
type: Boolean,
default: false,
},
isRichEditor: {
type: Boolean,
default: true,
Expand Down Expand Up @@ -189,7 +193,7 @@ export default {
submenuVisibility: {},
lastImagePath: null,
icons: [...menuBarIcons],
editorHasFocus: false
editorHasFocus: false,
}
},
computed: {
Expand Down