Skip to content

Commit

Permalink
Merge pull request #1959 from nextcloud/bugfix/noid/mobile-menu-popover
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Nov 26, 2021
2 parents 712f99b + 93e3a09 commit 5da5d63
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 19 deletions.
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/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.

4 changes: 3 additions & 1 deletion src/components/MenuBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
<ActionButton v-if="icon.class && isHiddenInMenu($index) && !(icon.class === 'icon-emoji')"
:key="icon.class"
:icon="icon.class"
@click="clickIcon(commands, icon)">
@click="clickIcon(commands, icon)"
:close-after-click="true">
{{ icon.label }}
</ActionButton>
<!--<template v-else-if="!icon.class && isHiddenInMenu($index)">
Expand Down Expand Up @@ -249,6 +250,7 @@ export default {
})
},
clickIcon(commands, icon) {
this.editor.focus()
return icon.action(commands)
},
getWindowWidth(event) {
Expand Down

0 comments on commit 5da5d63

Please sign in to comment.