161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-23 04:33:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop

Browse Source
This commit is contained in:
Freeplay 2023-06-02 18:14:43 -04:00
commit 6b0e582bd8
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CODE_OF_CONDUCT.md
View File

@ -59,7 +59,7 @@ representative at an online or offline event.
## Enforcement ## Enforcement
Servers of abusive, harassing, or otherwise unacceptable behavior may be Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at reported to the community leaders responsible for enforcement at
@thatonecalculator on Codeberg, @thatonecalculator on Codeberg,
`@kainoa@calckey.social` on the Fediverse, `@kainoa@calckey.social` on the Fediverse,

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' : '' }"
> >

3
packages/client/src/os.ts
View File

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

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