HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

chore: formatting

Browse source
This commit is contained in:
ThatOneCalculator 2023-06-02 14:53:28 -07:00
parent 088ff4c251
commit 8e5a374ac7
No known key found for this signature in database
GPG key ID: 8703CACD01000000
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/client/src/components/MkNote.vue
View file

@ -68,7 +68,9 @@
class="article" class="article"
@contextmenu.stop="onContextmenu" @contextmenu.stop="onContextmenu"
@click="noteClick" @click="noteClick"
:style="{ cursor: expandOnNoteClick && !detailedView ? 'pointer' : '' }" :style="{
cursor: expandOnNoteClick && !detailedView ? 'pointer' : '',
}"
> >
<div class="main"> <div class="main">
<div class="header-container"> <div class="header-container">
@ -503,7 +505,11 @@ function scrollIntoView() {
} }
function noteClick(e) { function noteClick(e) {
if (document.getSelection().type === "Range" || props.detailedView || !expandOnNoteClick) { if (
document.getSelection().type === "Range" ||
props.detailedView ||
!expandOnNoteClick
) {
e.stopPropagation(); e.stopPropagation();
} else { } else {
router.push(notePage(appearNote)); router.push(notePage(appearNote));

3
packages/client/src/components/MkNoteSub.vue
View file

@ -14,7 +14,8 @@
@contextmenu.stop="onContextmenu" @contextmenu.stop="onContextmenu"
> >
<div v-if="conversation && depth > 1" class="line"></div> <div v-if="conversation && depth > 1" class="line"></div>
<div class="main" <div
class="main"
@click="noteClick" @click="noteClick"
:style="{ cursor: expandOnNoteClick ? 'pointer' : '' }" :style="{ cursor: expandOnNoteClick ? 'pointer' : '' }"
> >

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

@ -278,7 +278,7 @@ export function alert(props: {
}): Promise<void> { }): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (props.text == null && props.type === "error") { if (props.text == null && props.type === "error") {
props.text = "An unknown error occured!" props.text = "An unknown error occured!";
} }
popup( popup(
MkDialog, MkDialog,

3
packages/client/src/pages/about-calckey.vue
View file

@ -98,8 +98,7 @@
:text="'$[sparkle @kainoa@calckey.social] (Main developer)'" :text="'$[sparkle @kainoa@calckey.social] (Main developer)'"
/></FormLink> /></FormLink>
<FormLink to="/@april@calckey.social" <FormLink to="/@april@calckey.social"
><Mfm ><Mfm :text="'@april@calckey.social (Backend)'"
:text="'@april@calckey.social (Backend)'"
/></FormLink> /></FormLink>
<FormLink to="/@freeplay@calckey.social" <FormLink to="/@freeplay@calckey.social"
><Mfm ><Mfm

8
packages/client/src/pages/settings/general.vue
View file

@ -54,9 +54,11 @@
<FormSwitch v-model="disablePagesScript" class="_formBlock">{{ <FormSwitch v-model="disablePagesScript" class="_formBlock">{{
i18n.ts.disablePagesScript i18n.ts.disablePagesScript
}}</FormSwitch> }}</FormSwitch>
<FormSwitch v-model="expandOnNoteClick" class="_formBlock">{{ <FormSwitch v-model="expandOnNoteClick" class="_formBlock"
i18n.ts.expandOnNoteClick >{{ i18n.ts.expandOnNoteClick
}}<template #caption>{{ i18n.ts.expandOnNoteClickDesc }}</template> }}<template #caption>{{
i18n.ts.expandOnNoteClickDesc
}}</template>
</FormSwitch> </FormSwitch>
<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock" <FormSwitch v-model="profile.showTimelineReplies" class="_formBlock"
>{{ i18n.ts.flagShowTimelineReplies >{{ i18n.ts.flagShowTimelineReplies