From 0e9b8be88caa8bb21891b2be5fe2eb1333aed345 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 2 Jul 2019 14:32:46 -0400
Subject: clear userId property of timeline by default in clearTimeline action

---
 src/components/timeline/timeline.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 9dafcbd8..b1c7edf8 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -86,7 +86,7 @@ const Timeline = {
       if (this.newStatusCount === 0) return
 
       if (this.timeline.flushMarker !== 0) {
-        this.$store.commit('clearTimeline', { timeline: this.timelineName })
+        this.$store.commit('clearTimeline', { timeline: this.timelineName, excludeUserId: true })
         this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
         this.fetchOlderStatuses()
       } else {
-- 
cgit v1.2.3-70-g09d2


From b70c2bfef756a398305c7933f0b6906be4432e4c Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 2 Jul 2019 14:43:01 -0400
Subject: make sure that user timelines are empty when opening profile page

---
 src/components/user_profile/user_profile.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index eab330e7..7eb4ed3a 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -31,6 +31,8 @@ const UserProfile = {
     }
   },
   created () {
+    // Make sure that timelines used in this page are empty
+    this.cleanUp()
     const routeParams = this.$route.params
     this.load(routeParams.name || routeParams.id)
   },
-- 
cgit v1.2.3-70-g09d2


From 0c102deeed91442999bbb9522e071b478d6388b0 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 2 Jul 2019 16:36:14 -0400
Subject: hide text format when only plaintext is available

---
 src/components/post_status_form/post_status_form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 67cdc721..505fd25e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -84,7 +84,7 @@
             <i class="icon-down-open"></i>
           </label>
         </div>
-        <div class="text-format" v-if="postFormats.length === 1">
+        <div class="text-format" v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'">
           <span class="only-format">
             {{$t(`post_status.content_type["${postFormats[0]}"]`)}}
           </span>
-- 
cgit v1.2.3-70-g09d2


From 6c6aa8446db6f6bab3240e96f82492e527ba4443 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 3 Jul 2019 12:19:25 -0400
Subject: place scope selector on the left consistently

---
 src/components/post_status_form/post_status_form.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/components')

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 505fd25e..52d1b43c 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -74,6 +74,13 @@
         </p>
       </EmojiInput>
       <div class="visibility-tray">
+        <scope-selector
+          :showAll="showAllScopes"
+          :userDefault="userDefaultScope"
+          :originalScope="copyMessageScope"
+          :initialScope="newStatus.visibility"
+          :onScopeChange="changeVis"/>
+
         <div class="text-format" v-if="postFormats.length > 1">
           <label for="post-content-type" class="select">
             <select id="post-content-type" v-model="newStatus.contentType" class="form-control">
@@ -89,13 +96,6 @@
             {{$t(`post_status.content_type["${postFormats[0]}"]`)}}
           </span>
         </div>
-
-        <scope-selector
-          :showAll="showAllScopes"
-          :userDefault="userDefaultScope"
-          :originalScope="copyMessageScope"
-          :initialScope="newStatus.visibility"
-          :onScopeChange="changeVis"/>
       </div>
     </div>
     <poll-form
@@ -170,7 +170,6 @@
   .visibility-tray {
     display: flex;
     justify-content: space-between;
-    flex-direction: row-reverse;
     padding-top: 5px;
   }
 }
@@ -217,7 +216,7 @@
   .icon-chart-bar {
     cursor: pointer;
   }
-  
+
 
   .error {
     text-align: center;
-- 
cgit v1.2.3-70-g09d2