Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions js/editor-rich.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor-rich.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/files-modal.js

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

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions src/components/EditorWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@
:autohide="autohide"
:loaded.sync="menubarLoaded">
<div class="text-editor__session-list">
<div v-if="isMobile" v-tooltip="lastSavedStatusTooltip" :class="saveStatusClass" />
<div v-if="isMobile"
v-tooltip="lastSavedStatusTooltip"
:class="saveStatusClass" />
<div v-else
v-tooltip="lastSavedStatusTooltip"
class="save-status"
:aria-label="t('text', 'Document save status')"
:class="lastSavedStatusClass">
{{ lastSavedStatus }}
</div>
Expand All @@ -78,6 +81,8 @@
:content-wrapper="contentWrapper"
:file-path="relativePath" />
<EditorContent v-show="contentLoaded"
tabindex="0"
role="document"
class="editor__content text-editor__content"
:editor="$editor" />
</div>
Expand Down Expand Up @@ -658,7 +663,9 @@ export default {
if (state.initialLoading && !this.contentLoaded) {
this.contentLoaded = true
if (this.autofocus && !this.readOnly) {
this.$editor.commands.focus()
this.$nextTick(() => {
this.$editor.commands.focus()
})
}
this.$emit('ready')
// TODO: remove $parent access
Expand Down
1 change: 1 addition & 0 deletions src/components/Menu/ActionImageUpload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
:data-text-action-entry="actionEntry.key"
:title="actionEntry.label"
:aria-label="actionEntry.label"
role="menu"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aria-haspopup>
<template #icon>
<component :is="icon"
Expand Down
2 changes: 2 additions & 0 deletions src/components/Menu/ActionList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
<template>
<Actions v-tooltip="tooltip"
class="entry-list-action entry-action"
role="menu"
v-bind="state"
:aria-label="actionEntry.label"
:title="actionEntry.label"
:data-text-action-entry="actionEntry.key"
:data-text-action-active="activeKey">
Expand Down
1 change: 1 addition & 0 deletions src/components/Menu/ActionSingle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export default {
attrs: {
title,
type: 'tertiary',
role: 'menuitem',
'data-text-action-entry': actionEntry.key,
...attrs,
},
Expand Down
1 change: 1 addition & 0 deletions src/components/Menu/EmojiPickerAction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
@selectData="addEmoji">
<Button v-tooltip="actionEntry.label"
class="entry-action__button"
role="menu"
:title="actionEntry.label"
:aria-label="actionEntry.label"
:aria-haspopup="true">
Expand Down
8 changes: 7 additions & 1 deletion src/components/Menu/MenuBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
<template>
<div class="text-menubar"
data-text-el="menubar"
role="menubar"
:aria-label="t('text', 'Formatting menubar')"
:class="{
'text-menubar--ready': isReady,
'text-menubar--show': isVisible,
Expand All @@ -32,7 +34,11 @@
}">
<HelpModal v-if="displayHelp" @close="hideHelp" />

<div v-if="$isRichEditor" ref="menubar" class="text-menubar__entries">
<div v-if="$isRichEditor"
ref="menubar"
role="group"
class="text-menubar__entries"
:aria-label="t('text', 'Editor actions')">
<ActionEntry v-for="actionEntry of visibleEntries"
v-bind="{ actionEntry }"
:key="`text-action--${actionEntry.key}`"
Expand Down