worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix(friendly): Prevent floating buttons from appearing inside chat rooms

Browse source
This commit is contained in:
NoriDev 2022-09-05 21:43:17 +09:00
parent 0fdf9151ee
commit 8cf6284cd4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/router.ts
View file

@ -388,10 +388,12 @@ export const routes = [{
component: page(() => import('./pages/messaging/index.vue')),
loginRequired: true,
}, {
name: 'messaging-room',
path: '/my/messaging/:userAcct',
component: page(() => import('./pages/messaging/messaging-room.vue')),
loginRequired: true,
}, {
name: 'messaging-room-group',
path: '/my/messaging/group/:groupId',
component: page(() => import('./pages/messaging/messaging-room.vue')),
loginRequired: true,

4
packages/client/src/ui/friendly.vue
View file

@ -16,9 +16,9 @@
<XWidgets @mounted="attachSticky"/>
</div>
<button v-if="isMobile" class="navButton nav _button" @click="drawerMenuShowing = true"><CPAvatar class="avatar" :user="$i" :disable-preview="true" :show-indicator="false"/></button>
<button v-if="isMobile && !(mainRouter.currentRoute.value.name === 'messaging-room' || mainRouter.currentRoute.value.name === 'messaging-room-group')" class="navButton nav _button" @click="drawerMenuShowing = true"><CPAvatar class="avatar" :user="$i" :disable-preview="true" :show-indicator="false"/></button>
<button v-if="isMobile" class="postButton post _button" @click="os.post()"><span class="bg"></span><i class="fas fa-pencil-alt"></i></button>
<button v-if="isMobile && !(mainRouter.currentRoute.value.name === 'messaging-room' || mainRouter.currentRoute.value.name === 'messaging-room-group')" class="postButton post _button" @click="os.post()"><span class="bg"></span><i class="fas fa-pencil-alt"></i></button>
<button v-if="!isDesktop && !isMobile" class="widgetButton _button" @click="widgetsShowing = true"><i class="fas fa-layer-group"></i></button>