sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wi

Browse Source
This commit is contained in:
syuilo
2020-09-05 19:38:57 +09:00
parent 5f3f9e2f8f
commit cb965feab4
14 changed files with 122 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/client/components/mfm.ts
View File

@@ -9,6 +9,7 @@ import MkFormula from './formula.vue';
import MkCode from './code.vue';
import MkGoogle from './google.vue';
import { host } from '../config';
import { RouterLink } from 'vue-router';
export default defineComponent({
props: {
@@ -71,17 +72,13 @@ export default defineComponent({
case 'italic': {
return h('i', {
attrs: {
style: 'font-style: oblique;'
},
style: 'font-style: oblique;'
}, genEl(token.children));
}
case 'big': {
return h('strong', {
attrs: {
style: `display: inline-block; font-size: 150%;`
},
style: `display: inline-block; font-size: 150%;`,
directives: [this.$store.state.device.animatedMfm ? {
name: 'animate-css',
value: { classes: 'tada', iteration: 'infinite' }
@@ -99,17 +96,13 @@ export default defineComponent({
case 'center': {
return [h('div', {
attrs: {
style: 'text-align:center;'
}
style: 'text-align:center;'
}, genEl(token.children))];
}
case 'motion': {
return h('span', {
attrs: {
style: 'display: inline-block;'
},
style: 'display: inline-block;',
directives: [this.$store.state.device.animatedMfm ? {
name: 'animate-css',
value: { classes: 'rubberBand', iteration: 'infinite' }
@@ -125,95 +118,75 @@ export default defineComponent({
const style = this.$store.state.device.animatedMfm
? `animation: spin 1.5s linear infinite; animation-direction: ${direction};` : '';
return h('span', {
attrs: {
style: 'display: inline-block;' + style
},
style: 'display: inline-block;' + style
}, genEl(token.children));
}
case 'jump': {
return h('span', {
attrs: {
style: this.$store.state.device.animatedMfm ? 'display: inline-block; animation: jump 0.75s linear infinite;' : 'display: inline-block;'
},
style: this.$store.state.device.animatedMfm ? 'display: inline-block; animation: jump 0.75s linear infinite;' : 'display: inline-block;'
}, genEl(token.children));
}
case 'flip': {
return h('span', {
attrs: {
style: 'display: inline-block; transform: scaleX(-1);'
},
style: 'display: inline-block; transform: scaleX(-1);'
}, genEl(token.children));
}
case 'url': {
return [h(MkUrl, {
key: Math.random(),
props: {
url: token.node.props.url,
rel: 'nofollow noopener',
},
url: token.node.props.url,
rel: 'nofollow noopener',
})];
}
case 'link': {
return [h(MkLink, {
key: Math.random(),
props: {
url: token.node.props.url,
rel: 'nofollow noopener',
},
url: token.node.props.url,
rel: 'nofollow noopener',
}, genEl(token.children))];
}
case 'mention': {
return [h(MkMention, {
key: Math.random(),
props: {
host: (token.node.props.host == null && this.author && this.author.host != null ? this.author.host : token.node.props.host) || host,
username: token.node.props.username
}
host: (token.node.props.host == null && this.author && this.author.host != null ? this.author.host : token.node.props.host) || host,
username: token.node.props.username
})];
}
case 'hashtag': {
return [h('router-link', {
return [h(RouterLink, {
key: Math.random(),
attrs: {
to: this.isNote ? `/tags/${encodeURIComponent(token.node.props.hashtag)}` : `/explore/tags/${encodeURIComponent(token.node.props.hashtag)}`,
style: 'color:var(--hashtag);'
}
to: this.isNote ? `/tags/${encodeURIComponent(token.node.props.hashtag)}` : `/explore/tags/${encodeURIComponent(token.node.props.hashtag)}`,
style: 'color:var(--hashtag);'
}, `#${token.node.props.hashtag}`)];
}
case 'blockCode': {
return [h(MkCode, {
key: Math.random(),
props: {
code: token.node.props.code,
lang: token.node.props.lang,
}
code: token.node.props.code,
lang: token.node.props.lang,
})];
}
case 'inlineCode': {
return [h(MkCode, {
key: Math.random(),
props: {
code: token.node.props.code,
lang: token.node.props.lang,
inline: true
}
code: token.node.props.code,
lang: token.node.props.lang,
inline: true
})];
}
case 'quote': {
if (this.shouldBreak) {
return [h('div', {
attrs: {
class: 'quote'
}
class: 'quote'
}, genEl(token.children))];
} else {
return [h('span', {
@@ -226,57 +199,45 @@ export default defineComponent({
case 'title': {
return [h('div', {
attrs: {
class: 'title'
}
class: 'title'
}, genEl(token.children))];
}
case 'emoji': {
return [h('mk-emoji', {
key: Math.random(),
attrs: {
emoji: token.node.props.emoji,
name: token.node.props.name
},
props: {
customEmojis: this.customEmojis,
normal: this.plain
}
emoji: token.node.props.emoji,
name: token.node.props.name,
customEmojis: this.customEmojis,
normal: this.plain
})];
}
case 'mathInline': {
return [h(MkFormula, {
key: Math.random(),
props: {
formula: token.node.props.formula,
block: false
}
formula: token.node.props.formula,
block: false
})];
}
case 'mathBlock': {
return [h(MkFormula, {
key: Math.random(),
props: {
formula: token.node.props.formula,
block: true
}
formula: token.node.props.formula,
block: true
})];
}
case 'search': {
return [h(MkGoogle, {
key: Math.random(),
props: {
q: token.node.props.query
}
q: token.node.props.query
})];
}
default: {
console.log('unknown ast type:', token.node.type);
console.log('unrecognized ast type:', token.node.type);
return [];
}

4
src/client/components/notification-setting-window.vue
View File

@@ -19,14 +19,14 @@
</template>
<script lang="ts">
import Vue, { PropType } from 'vue';
import { defineComponent, PropType } from 'vue';
import XWindow from './window.vue';
import MkSwitch from './ui/switch.vue';
import MkInfo from './ui/info.vue';
import MkButton from './ui/button.vue';
import { notificationTypes } from '../../types';
export default Vue.extend({
export default defineComponent({
components: {
XWindow,
MkSwitch,

3
src/client/components/notification.vue
View File

@@ -66,6 +66,7 @@ import XReactionIcon from './reaction-icon.vue';
import MkFollowButton from './follow-button.vue';
import notePage from '../filters/note';
import { userPage } from '../filters/user';
import { locale } from '../i18n';
export default defineComponent({
components: {
@@ -89,7 +90,7 @@ export default defineComponent({
},
data() {
return {
getNoteSummary: (text: string) => noteSummary(text, this.$root.i18n.messages[this.$root.i18n.locale]),
getNoteSummary: (text: string) => noteSummary(text, locale),
followRequestDone: false,
groupInviteDone: false,
connection: null,

17
src/client/components/post-form-dialog.vue
View File

@@ -1,14 +1,14 @@
<template>
<div class="ulveipgl">
<transition :name="$store.state.device.animation ? 'form-fade' : ''" appear @after-leave="$emit('closed');">
<div class="bg _modalBg" ref="bg" v-if="show" @click="close()"></div>
<div class="ulveipgl" :style="{ pointerEvents: closing ? 'none' : 'auto' }">
<transition :name="$store.state.device.animation ? 'form-fade' : ''" appear @after-leave="$store.commit('setPostForm', null)">
<div class="bg _modalBg" ref="bg" v-if="!closing" @click="close()"></div>
</transition>
<div class="main" ref="main" @click.self="close()" @keydown="onKeydown">
<transition :name="$store.state.device.animation ? 'form' : ''" appear
@after-leave="destroyDom"
>
<x-post-form ref="form"
v-if="show"
v-if="!closing"
:reply="reply"
:renote="renote"
:mention="mention"
@@ -18,7 +18,8 @@
:instant="instant"
@posted="onPosted"
@cancel="onCanceled"
style="border-radius: var(--radius);"/>
style="border-radius: var(--radius);"
/>
</transition>
</div>
</div>
@@ -67,7 +68,7 @@ export default defineComponent({
data() {
return {
show: true
closing: false
};
},
@@ -77,9 +78,7 @@ export default defineComponent({
},
close() {
this.show = false;
(this.$refs.bg as any).style.pointerEvents = 'none';
(this.$refs.main as any).style.pointerEvents = 'none';
this.closing = true;
},
onPosted() {

1
src/client/components/ui/input.vue
View File

@@ -193,6 +193,7 @@ export default defineComponent({
id,
v,
focused,
invalid,
changed,
filled,
inputEl,