heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Prevent users from opening note menu when already opened (#5367)

Browse source
This commit is contained in:
Aya Morisawa 2019-09-02 04:45:01 +09:00 committed by syuilo
parent 593c2b9517
commit 701fee3139
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/client/app/common/scripts/note-mixin.ts
View file

@ -27,7 +27,8 @@ export default (opts: Opts = {}) => ({
data() { data() {
return { return {
showContent: false, showContent: false,
hideThisNote: false hideThisNote: false,
openingMenu: false
}; };
}, },
@ -192,11 +193,16 @@ export default (opts: Opts = {}) => ({
}, },
menu(viaKeyboard = false) { menu(viaKeyboard = false) {
if (this.openingMenu) return;
this.openingMenu = true;
this.$root.new(MkNoteMenu, { this.$root.new(MkNoteMenu, {
source: this.$refs.menuButton, source: this.$refs.menuButton,
note: this.appearNote, note: this.appearNote,
animation: !viaKeyboard animation: !viaKeyboard
}).$once('closed', this.focus); }).$once('closed', () => {
this.openingMenu = false;
this.focus();
});
}, },
toggleShowContent() { toggleShowContent() {

1
src/client/app/common/views/components/note-menu.vue
View file

@ -227,6 +227,7 @@ export default Vue.extend({
}, },
closed() { closed() {
this.$emit('closed');
this.$nextTick(() => { this.$nextTick(() => {
this.destroyDom(); this.destroyDom();
}); });