Signed-off-by: dartcafe <github@dartcafe.de>
This commit is contained in:
dartcafe 2023-10-03 08:34:46 +02:00
Родитель adfd466107
Коммит 9da0622152
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: CCE73CEF3035D3C8
2 изменённых файлов: 11 добавлений и 11 удалений

Просмотреть файл

@ -24,7 +24,7 @@
<NcContent app-name="polls" :class="appClass">
<router-view v-if="getCurrentUser()" name="navigation" />
<router-view />
<router-view v-show="sideBar.open && (poll.acl.allowEdit || poll.acl.allowComment)" name="sidebar" />
<router-view v-if="poll.acl.allowEdit || poll.acl.allowComment" name="sidebar" />
<LoadingOverlay v-if="loading" />
<UserSettingsDlg />
</NcContent>
@ -34,7 +34,7 @@
import UserSettingsDlg from './components/Settings/UserSettingsDlg.vue'
import { getCurrentUser } from '@nextcloud/auth'
import { NcContent } from '@nextcloud/vue'
import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import { mapState, mapActions } from 'vuex'
import '@nextcloud/dialogs/dist/index.css'
import './assets/scss/colors.scss'
@ -57,9 +57,6 @@ export default {
data() {
return {
sideBar: {
open: (window.innerWidth > 920),
},
transitionClass: 'transitions-active',
loading: false,
isLoggedin: !!getCurrentUser(),
@ -119,16 +116,11 @@ export default {
this.loadPoll(silent)
})
subscribe('polls:sidebar:toggle', (payload) => {
emit('polls:sidebar:changeTab', { activeTab: payload?.activeTab })
this.sideBar.open = payload?.open ?? !this.sideBar.open
})
},
beforeDestroy() {
this.cancelToken.cancel()
unsubscribe('polls:poll:load')
unsubscribe('polls:sidebar:toggle')
unsubscribe('polls:transitions:on')
unsubscribe('polls:transitions:off')
},

Просмотреть файл

@ -21,7 +21,8 @@
-->
<template>
<NcAppSidebar :active.sync="activeTab"
<NcAppSidebar v-show="showSidebar"
:active.sync="activeTab"
:title="t('polls', 'Details')"
@close="closeSideBar()">
<NcAppSidebarTab v-if="acl.allowEdit"
@ -112,6 +113,7 @@ export default {
data() {
return {
activeTab: t('polls', 'Comments').toLowerCase(),
showSidebar: (window.innerWidth > 920),
}
},
@ -129,10 +131,16 @@ export default {
subscribe('polls:sidebar:changeTab', (payload) => {
this.activeTab = payload?.activeTab ?? this.activeTab
})
subscribe('polls:sidebar:toggle', (payload) => {
emit('polls:sidebar:changeTab', { activeTab: payload?.activeTab })
this.showSidebar = payload?.open ?? !this.showSidebar
})
},
beforeDestroy() {
unsubscribe('polls:sidebar:changeTab')
unsubscribe('polls:sidebar:toggle')
},
methods: {