From 748b1ed1673033b2564ea9833d74f8c88c9c343b Mon Sep 17 00:00:00 2001
From: jared <jaredrmain@gmail.com>
Date: Mon, 1 Apr 2019 12:54:34 -0400
Subject: [PATCH 1/4] #470 - fix subject and content toggle issue
---
src/components/status/status.js | 3 +++
src/components/status/status.vue | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 550fe76f..cb2693e1 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -251,6 +251,9 @@ const Status = {
},
maxThumbnails () {
return this.$store.state.config.maxThumbnails
+ },
+ contentHtml () {
+ return this.status.summary_html + '<br />' + this.status.statusnet_html
}
},
components: {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 1f415534..b66c1c93 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -99,12 +99,12 @@
<div class="status-content-wrapper" :class="{ 'tall-status': !showingLongSubject }" v-if="longSubject">
<a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="!showingLongSubject" href="#" @click.prevent="showingLongSubject=true">Show more</a>
- <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html"></div>
+ <div @click.prevent="linkClicked" class="status-content media-body" v-html="contentHtml"></div>
<a v-if="showingLongSubject" href="#" class="status-unhider" @click.prevent="showingLongSubject=false">Show less</a>
</div>
<div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper" v-else>
<a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowMore">Show more</a>
- <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html" v-if="!hideSubjectStatus"></div>
+ <div @click.prevent="linkClicked" class="status-content media-body" v-html="contentHtml" v-if="!hideSubjectStatus"></div>
<div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary_html" v-else></div>
<a v-if="hideSubjectStatus" href="#" class="cw-status-hider" @click.prevent="toggleShowMore">Show more</a>
<a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a>
From 6847e70a492f651ea14cdec1a87b520d1a2d5ece Mon Sep 17 00:00:00 2001
From: jared <jaredrmain@gmail.com>
Date: Mon, 1 Apr 2019 12:58:23 -0400
Subject: [PATCH 2/4] #470 - update i18n
---
src/components/status/status.vue | 10 +++++-----
src/i18n/en.json | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index b66c1c93..690e8318 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -98,16 +98,16 @@
</div>
<div class="status-content-wrapper" :class="{ 'tall-status': !showingLongSubject }" v-if="longSubject">
- <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="!showingLongSubject" href="#" @click.prevent="showingLongSubject=true">Show more</a>
+ <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="!showingLongSubject" href="#" @click.prevent="showingLongSubject=true">{{$t("general.show_more")}}</a>
<div @click.prevent="linkClicked" class="status-content media-body" v-html="contentHtml"></div>
- <a v-if="showingLongSubject" href="#" class="status-unhider" @click.prevent="showingLongSubject=false">Show less</a>
+ <a v-if="showingLongSubject" href="#" class="status-unhider" @click.prevent="showingLongSubject=false">{{$t("general.show_less")}}</a>
</div>
<div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper" v-else>
- <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowMore">Show more</a>
+ <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowMore">{{$t("general.show_more")}}</a>
<div @click.prevent="linkClicked" class="status-content media-body" v-html="contentHtml" v-if="!hideSubjectStatus"></div>
<div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary_html" v-else></div>
- <a v-if="hideSubjectStatus" href="#" class="cw-status-hider" @click.prevent="toggleShowMore">Show more</a>
- <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a>
+ <a v-if="hideSubjectStatus" href="#" class="cw-status-hider" @click.prevent="toggleShowMore">{{$t("general.show_more")}}</a>
+ <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">{{$t("general.show_less")}}</a>
</div>
<div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index c501c6a7..32d634e8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -20,7 +20,9 @@
"submit": "Submit",
"more": "More",
"generic_error": "An error occured",
- "optional": "optional"
+ "optional": "optional",
+ "show_more": "Show More",
+ "show_less": "Show Less"
},
"image_cropper": {
"crop_picture": "Crop picture",
From 487a194f6d83472c57588b6c8e46b52dd4d3e2f7 Mon Sep 17 00:00:00 2001
From: jared <jaredrmain@gmail.com>
Date: Mon, 1 Apr 2019 13:01:28 -0400
Subject: [PATCH 3/4] #470 - handle cases without subject
---
src/components/status/status.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/components/status/status.js b/src/components/status/status.js
index cb2693e1..0295cd04 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -253,6 +253,9 @@ const Status = {
return this.$store.state.config.maxThumbnails
},
contentHtml () {
+ if (!this.status.summary_html) {
+ return this.status.statusnet_html
+ }
return this.status.summary_html + '<br />' + this.status.statusnet_html
}
},
From dee9ab7bda8edd28868d55d6738665022a53c1a0 Mon Sep 17 00:00:00 2001
From: jared <jaredrmain@gmail.com>
Date: Mon, 1 Apr 2019 13:04:40 -0400
Subject: [PATCH 4/4] #470 - update button text capitalization
---
src/i18n/en.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 32d634e8..baf3b28a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -21,8 +21,8 @@
"more": "More",
"generic_error": "An error occured",
"optional": "optional",
- "show_more": "Show More",
- "show_less": "Show Less"
+ "show_more": "Show more",
+ "show_less": "Show less"
},
"image_cropper": {
"crop_picture": "Crop picture",