From 7ae85c8318add44af1c8f91c9738a2d715da2f3e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 8 Jun 2021 14:51:42 +0300
Subject: [PATCH] change defaults
---
src/components/mention_link/mention_link.js | 4 +-
src/components/mention_link/mention_link.vue | 23 ++++--
src/components/mentions_line/mentions_line.js | 4 +-
.../mentions_line/mentions_line.vue | 75 ++++++++++---------
.../settings_modal/tabs/general_tab.vue | 8 +-
src/components/status/status.js | 4 +-
src/components/status/status.vue | 5 +-
src/components/status_body/status_body.js | 4 +-
src/components/status_body/status_body.vue | 2 +-
src/modules/config.js | 4 +-
10 files changed, 74 insertions(+), 59 deletions(-)
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 8a93e8a3..8ad84a51 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -52,10 +52,10 @@ const MentionLink = {
if (this.highlight) return highlightClass(this.user)
},
oldPlace () {
- return this.mergedConfig.mentionsOldPlace
+ return !this.mergedConfig.mentionsOwnLine
},
oldStyle () {
- return this.mergedConfig.mentionsOldStyle
+ return !this.mergedConfig.mentionsNewStyle
},
style () {
if (this.highlight) {
diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue
index d2f4129d..55f49507 100644
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@@ -1,8 +1,8 @@
<template>
-<span
- class="MentionLink"
- :class="{ '-oldPlace': oldPlace }"
->
+ <span
+ class="MentionLink"
+ :class="{ '-oldPlace': oldPlace }"
+ >
<!-- eslint-disable vue/no-v-html -->
<a
v-if="!user"
@@ -23,8 +23,14 @@
@click.prevent="onClick"
>
<!-- eslint-disable vue/no-v-html -->
- <span class="shortName"><span class="userName" v-html="userName" /></span>
- <span class="you" v-if="isYou">{{ $t('status.you') }}</span>
+ <span class="shortName"><span
+ class="userName"
+ v-html="userName"
+ /></span>
+ <span
+ v-if="isYou"
+ class="you"
+ >{{ $t('status.you') }}</span>
<!-- eslint-enable vue/no-v-html -->
</button>
<span
@@ -33,7 +39,10 @@
:class="[highlightType]"
>
<!-- eslint-disable vue/no-v-html -->
- <span class="userNameFull" v-html="userNameFull" />
+ <span
+ class="userNameFull"
+ v-html="userNameFull"
+ />
<!-- eslint-enable vue/no-v-html -->
</span>
</span>
diff --git a/src/components/mentions_line/mentions_line.js b/src/components/mentions_line/mentions_line.js
index 2e84d4c5..6f347058 100644
--- a/src/components/mentions_line/mentions_line.js
+++ b/src/components/mentions_line/mentions_line.js
@@ -15,7 +15,7 @@ const MentionsLine = {
},
computed: {
oldStyle () {
- return this.mergedConfig.mentionsOldStyle
+ return !this.mergedConfig.mentionsNewStyle
},
limit () {
return 6
@@ -39,7 +39,7 @@ const MentionsLine = {
: '-newStyle'
]
},
- ...mapGetters(['mergedConfig']),
+ ...mapGetters(['mergedConfig'])
},
methods: {
toggleShowMore () {
diff --git a/src/components/mentions_line/mentions_line.vue b/src/components/mentions_line/mentions_line.vue
index 6d114f2d..58f3de6f 100644
--- a/src/components/mentions_line/mentions_line.vue
+++ b/src/components/mentions_line/mentions_line.vue
@@ -1,42 +1,45 @@
<template>
-<span class="MentionsLine">
- <MentionLink
- v-for="mention in mentions"
- class="mention-link"
- :key="mention.statusnet_profile_url"
- :content="mention.statusnet_profile_url"
- :url="mention.statusnet_profile_url"
- :first-mention="false"
- /><span v-if="manyMentions" class="extraMentions">
- <span
- v-if="expanded"
- class="fullExtraMentions"
+ <span class="MentionsLine">
+ <MentionLink
+ v-for="mention in mentions"
+ :key="mention.statusnet_profile_url"
+ class="mention-link"
+ :content="mention.statusnet_profile_url"
+ :url="mention.statusnet_profile_url"
+ :first-mention="false"
+ /><span
+ v-if="manyMentions"
+ class="extraMentions"
>
- <MentionLink
- v-for="mention in extraMentions"
- class="mention-link"
- :key="mention.statusnet_profile_url"
- :content="mention.statusnet_profile_url"
- :url="mention.statusnet_profile_url"
- :first-mention="false"
- />
- </span><button
- v-if="!expanded"
- class="showMoreLess"
- :class="buttonClasses"
- @click="toggleShowMore"
- >
- {{ $t('status.plus_more', { number: extraMentions.length })}}
- </button><button
- v-if="expanded"
- class="showMoreLess"
- :class="buttonClasses"
- @click="toggleShowMore"
- >
- {{ $t('general.show_less')}}
- </button>
+ <span
+ v-if="expanded"
+ class="fullExtraMentions"
+ >
+ <MentionLink
+ v-for="mention in extraMentions"
+ :key="mention.statusnet_profile_url"
+ class="mention-link"
+ :content="mention.statusnet_profile_url"
+ :url="mention.statusnet_profile_url"
+ :first-mention="false"
+ />
+ </span><button
+ v-if="!expanded"
+ class="showMoreLess"
+ :class="buttonClasses"
+ @click="toggleShowMore"
+ >
+ {{ $t('status.plus_more', { number: extraMentions.length }) }}
+ </button><button
+ v-if="expanded"
+ class="showMoreLess"
+ :class="buttonClasses"
+ @click="toggleShowMore"
+ >
+ {{ $t('general.show_less') }}
+ </button>
+ </span>
</span>
-</span>
</template>
<script src="./mentions_line.js" ></script>
<style lang="scss" src="./mentions_line.scss" />
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index c8bab869..e62df290 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -37,13 +37,13 @@
</BooleanSetting>
</li>
<li>
- <BooleanSetting path="mentionsOldPlace">
- {{ $t('settings.mentions_old_place') }}
+ <BooleanSetting path="mentionsOwnLine">
+ {{ $t('settings.mentions_new_place') }}
</BooleanSetting>
</li>
<li>
- <BooleanSetting path="mentionsOldStyle">
- {{ $t('settings.mentions_old_style') }}
+ <BooleanSetting path="mentionsNewStyle">
+ {{ $t('settings.mentions_new_style') }}
</BooleanSetting>
</li>
<li>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index d921f625..3954df00 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -163,8 +163,8 @@ const Status = {
muteWordHits () {
return muteWordHits(this.status, this.muteWords)
},
- mentionsOldPlace () {
- return this.mergedConfig.mentionsOldPlace
+ mentionsOwnLine () {
+ return this.mergedConfig.mentionsOwnLine
},
mentions () {
return this.statusoid.attentions.filter(attn => {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index faf67328..969e2bc8 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -291,7 +291,10 @@
</div>
</div>
- <div v-if="hasMentions && !mentionsOldPlace" class="heading-mentions-row">
+ <div
+ v-if="hasMentions && mentionsOwnLine"
+ class="heading-mentions-row"
+ >
<div
class="mentions"
>
diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index 0c1aa88e..3c092ac7 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -105,8 +105,8 @@ const StatusContent = {
attachmentTypes () {
return this.status.attachments.map(file => fileType.fileType(file.mimetype))
},
- mentionsOldPlace () {
- return this.mergedConfig.mentionsOldPlace
+ mentionsOwnLine () {
+ return this.mergedConfig.mentionsOwnLine
},
mentions () {
return this.status.attentions
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index 92e47118..fadbeaf3 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -43,7 +43,7 @@
v-if="!hideSubjectStatus && !(singleLine && status.summary_html)"
>
<MentionsLine
- v-if="mentionsOldPlace"
+ v-if="!mentionsOwnLine"
:attentions="status.attentions"
class="mentions-line"
/>
diff --git a/src/modules/config.js b/src/modules/config.js
index 6e21e38b..ad9c8be5 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -54,8 +54,8 @@ export const defaultState = {
interfaceLanguage: browserLocale,
hideScopeNotice: false,
useStreamingApi: false,
- mentionsOldPlace: false,
- mentionsOldStyle: false,
+ mentionsOwnLine: false,
+ mentionsNewStyle: false,
sidebarRight: undefined, // instance default
scopeCopy: undefined, // instance default
subjectLineBehavior: undefined, // instance default