From c9891703219607c19069ff26a4956a7636e5ab3a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shpuld@gmail.com>
Date: Wed, 12 Apr 2017 19:07:55 +0300
Subject: [PATCH] lint fixes

---
 src/components/conversation/conversation.js |  6 +++---
 src/components/status/status.js             | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index fa042d23..f3aeb216 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -8,7 +8,7 @@ const sortAndFilterConversation = (conversation) => {
 }
 
 const conversation = {
-  data() {
+  data () {
     return {
       highlight: this.statusoid.id
     }
@@ -60,8 +60,8 @@ const conversation = {
         return (id === this.statusoid.id)
       }
     },
-    setHighlight(id) {
-      this.highlight = id
+    setHighlight (id) {
+      this.highlight = Number(id)
     }
   }
 }
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 11e4430f..82de0fd2 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -57,12 +57,13 @@ const Status = {
     },
     isFocused () {
       // retweet or root of an expanded conversation
-      if(this.focused)
+      if (this.focused) {
         return true
-      // use conversation highlight only when in conversation
-      else if(!this.inConversation)
+      } else if (!this.inConversation) {
         return false
-      return this.highlight == this.status.id
+      }
+      // use conversation highlight only when in conversation
+      return this.status.id === this.highlight
     }
   },
   components: {
@@ -100,14 +101,16 @@ const Status = {
     }
   },
   watch: {
-    'highlight': function (newfocus) {
-      if(this.status.id == newfocus) {
+    'highlight': function (id) {
+      id = Number(id)
+      if (this.status.id === id) {
         let rect = this.$el.getBoundingClientRect()
-        if(rect.top < 100)
+        if (rect.top < 100) {
           window.scrollBy(0, rect.top - 200)
-        // will be useful when scrolling down to replies or root posts is in
-        else if(rect.bottom > window.innerHeight - 100)
+        } else if(rect.bottom > window.innerHeight - 100) {
+          // will be useful when scrolling down to replies or root posts is in
           window.scrollBy(0, rect.bottom + 200)
+        }
       }
     }
   }