diff options
Diffstat (limited to 'src/client/app/common')
12 files changed, 16 insertions, 16 deletions
diff --git a/src/client/app/common/hotkey.ts b/src/client/app/common/hotkey.ts index b2afd57ae3..a53d3f479e 100644 --- a/src/client/app/common/hotkey.ts +++ b/src/client/app/common/hotkey.ts @@ -52,7 +52,7 @@ function match(e: KeyboardEvent, patterns: action['patterns']): boolean { pattern.ctrl == e.ctrlKey && pattern.shift == e.shiftKey && pattern.alt == e.altKey && - e.metaKey == false + !e.metaKey ); } diff --git a/src/client/app/common/scripts/should-mute-note.ts b/src/client/app/common/scripts/should-mute-note.ts index c5f1898942..8fd7888628 100644 --- a/src/client/app/common/scripts/should-mute-note.ts +++ b/src/client/app/common/scripts/should-mute-note.ts @@ -11,9 +11,9 @@ export default function(me, settings, note) { return ( (!isMyNote && note.reply && includesMutedWords(note.reply.text)) || (!isMyNote && note.renote && includesMutedWords(note.renote.text)) || - (settings.showMyRenotes === false && isMyNote && isPureRenote) || - (settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) || - (settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) || + (!settings.showMyRenotes && isMyNote && isPureRenote) || + (!settings.showRenotedMyNotes && isPureRenote && note.renote.userId == me.id) || + (!settings.showLocalRenotes && isPureRenote && note.renote.user.host == null) || (!isMyNote && includesMutedWords(note.text)) ); } diff --git a/src/client/app/common/views/components/analog-clock.vue b/src/client/app/common/views/components/analog-clock.vue index 4ba578a1a4..5eb7ffd153 100644 --- a/src/client/app/common/views/components/analog-clock.vue +++ b/src/client/app/common/views/components/analog-clock.vue @@ -80,7 +80,7 @@ export default Vue.extend({ ms(): number { return this.now.getMilliseconds() * this.smooth; - } + }, s(): number { return this.now.getSeconds(); }, diff --git a/src/client/app/common/views/components/messaging.vue b/src/client/app/common/views/components/messaging.vue index 957fd389d9..f884a599d7 100644 --- a/src/client/app/common/views/components/messaging.vue +++ b/src/client/app/common/views/components/messaging.vue @@ -202,7 +202,7 @@ export default Vue.extend({ left 0 z-index 1 width 100% - box-shadow 0 0px 2px rgba(#000, 0.2) + box-shadow 0 0 2px rgba(#000, 0.2) > .form background rgba(0, 0, 0, 0.02) diff --git a/src/client/app/common/views/components/page-editor/page-editor.vue b/src/client/app/common/views/components/page-editor/page-editor.vue index d70049121d..baccda8a43 100644 --- a/src/client/app/common/views/components/page-editor/page-editor.vue +++ b/src/client/app/common/views/components/page-editor/page-editor.vue @@ -36,10 +36,10 @@ </ui-select> <div class="eyeCatch"> - <ui-button v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catchig-image') }}</ui-button> + <ui-button v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catching-image') }}</ui-button> <div v-else-if="eyeCatchingImage"> <img :src="eyeCatchingImage.url" :alt="eyeCatchingImage.name"/> - <ui-button @click="removeEyeCatchingImage()" v-if="!readonly"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catchig-image') }}</ui-button> + <ui-button @click="removeEyeCatchingImage()" v-if="!readonly"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catching-image') }}</ui-button> </div> </div> </template> diff --git a/src/client/app/common/views/components/settings/theme.vue b/src/client/app/common/views/components/settings/theme.vue index 3440aacb28..b1f7b2bc49 100644 --- a/src/client/app/common/views/components/settings/theme.vue +++ b/src/client/app/common/views/components/settings/theme.vue @@ -273,7 +273,7 @@ export default Vue.extend({ import_() { (this.$refs.file as any).click(); - } + }, export_() { const blob = new Blob([this.selectedThemeCode], { diff --git a/src/client/app/common/views/components/ui/input.vue b/src/client/app/common/views/components/ui/input.vue index a841ecca11..dd0912f833 100644 --- a/src/client/app/common/views/components/ui/input.vue +++ b/src/client/app/common/views/components/ui/input.vue @@ -322,7 +322,7 @@ root(fill) > .value display block - width 0% + width 0 height 100% background transparent border-radius 6px diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue index 53577bad00..6761886b09 100644 --- a/src/client/app/common/views/components/user-list.vue +++ b/src/client/app/common/views/components/user-list.vue @@ -166,7 +166,7 @@ export default Vue.extend({ > .follow-button position absolute top 8px - right 0px + right 0 > .more display block diff --git a/src/client/app/common/views/deck/deck.column.vue b/src/client/app/common/views/deck/deck.column.vue index fcf9c506bb..eaa344d36f 100644 --- a/src/client/app/common/views/deck/deck.column.vue +++ b/src/client/app/common/views/deck/deck.column.vue @@ -160,7 +160,7 @@ export default Vue.extend({ this.$emit('top'); } - if (this.$store.state.settings.fetchOnScroll !== false) { + if (this.$store.state.settings.fetchOnScroll) { const current = this.$refs.body.scrollTop + this.$refs.body.clientHeight; if (current > this.$refs.body.scrollHeight - 1) this.$emit('bottom'); } diff --git a/src/client/app/common/views/deck/deck.user-column.vue b/src/client/app/common/views/deck/deck.user-column.vue index fb50d880eb..8d1b458a84 100644 --- a/src/client/app/common/views/deck/deck.user-column.vue +++ b/src/client/app/common/views/deck/deck.user-column.vue @@ -205,7 +205,7 @@ export default Vue.extend({ top -32px left 0 right 0 - width 0px + width 0 margin 0 auto border-top solid 16px transparent border-left solid 16px transparent diff --git a/src/client/app/common/views/directives/autocomplete.ts b/src/client/app/common/views/directives/autocomplete.ts index 7f8e409a7c..40fe06c19a 100644 --- a/src/client/app/common/views/directives/autocomplete.ts +++ b/src/client/app/common/views/directives/autocomplete.ts @@ -102,7 +102,7 @@ class Autocomplete { } } - if (isHashtag && opened == false) { + if (isHashtag && !opened) { const hashtag = text.substr(hashtagIndex + 1); if (!hashtag.includes(' ')) { this.open('hashtag', hashtag); @@ -110,7 +110,7 @@ class Autocomplete { } } - if (isEmoji && opened == false) { + if (isEmoji && !opened) { const emoji = text.substr(emojiIndex + 1); if (!emoji.includes(' ')) { this.open('emoji', emoji); diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue index 29853f95b8..29580fab64 100644 --- a/src/client/app/common/views/pages/page/page.vue +++ b/src/client/app/common/views/pages/page/page.vue @@ -47,7 +47,7 @@ class Script { public interpolate(str: string) { if (str == null) return null; - return str.replace(/\{(.+?)\}/g, match => { + return str.replace(/{(.+?)}/g, match => { const v = this.vars[match.slice(1, -1).trim()]; return v == null ? 'NULL' : v.toString(); }); |