pleroma-fe

commit: 0bd77149a06bcd7e0a904d0f5c2e2691996ff898
parent: d0df98f99b66cf003973346bcb1f6cdd7e4be33c
Author: lambda <pleromagit@rogerbraun.net>
Date:   Wed, 30 Jan 2019 17:47:46 +0000

Merge branch 'fix/tall-statuses-v2' into 'develop'

More tall status related fixes that I didn't know was borkd

See merge request pleroma/pleroma-fe!498
Diffstat:
M
src/components/status/status.js
13
++++++++-----

1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/status/status.js b/src/components/status/status.js
@@ -180,7 +180,7 @@ const Status = {
       return this.tallStatus
     },
     showingMore () {
-      return this.showingTall || (this.status.summary && this.expandingSubject)
+      return (this.tallStatus && this.showingTall) || (this.status.summary && this.expandingSubject)
     },
     nsfwClickthrough () {
       if (!this.status.nsfw) {
@@ -316,11 +316,14 @@ const Status = {
     'highlight': function (id) {
       if (this.status.id === id) {
         let rect = this.$el.getBoundingClientRect()
-        if (rect.top < 140) {
-          window.scrollBy(0, rect.top - 200)
-        } else if (rect.top < window.innerHeight && rect.height >= (window.innerHeight - 50)) {
-          window.scrollBy(0, rect.top - 50)
+        if (rect.top < 100) {
+          // Post is above screen, match its top to screen top
+          window.scrollBy(0, rect.top - 100)
+        } else if (rect.height >= (window.innerHeight - 50)) {
+          // Post we want to see is taller than screen so match its top to screen top
+          window.scrollBy(0, rect.top - 100)
         } else if (rect.bottom > window.innerHeight - 50) {
+          // Post is below screen, match its bottom to screen bottom
           window.scrollBy(0, rect.bottom - window.innerHeight + 50)
         }
       }