From 76a83320d18fd56b35da8256f5bc30c6fe485d88 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 22 Aug 2018 19:17:35 +0900
Subject: [PATCH] refs #543 Start focus with j key in timeline

---
 .../components/TimelineSpace/Contents/Favourites.vue  | 11 ++++++++++-
 .../components/TimelineSpace/Contents/Hashtag/Tag.vue | 11 ++++++++++-
 .../components/TimelineSpace/Contents/Home.vue        | 11 ++++++++++-
 .../components/TimelineSpace/Contents/Local.vue       | 11 ++++++++++-
 .../components/TimelineSpace/Contents/Public.vue      | 11 ++++++++++-
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/Contents/Favourites.vue b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
index 02dca8a4..122bcb68 100644
--- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="favourites">
+<div id="favourites" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
   <div class="fav" v-for="message in favourites" v-bind:key="message.id">
@@ -167,6 +167,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.id
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.favourites[0].uri
+          }
+          break
+      }
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
index a4b868d5..78123323 100644
--- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
@@ -1,5 +1,5 @@
 <template>
-<div name="tag">
+<div name="tag" v-shortkey="{next:['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -205,6 +205,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.uri
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.timeline[0].uri
+          }
+          break
+      }
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue
index 1eac656c..a1aea6f3 100644
--- a/src/renderer/components/TimelineSpace/Contents/Home.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Home.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="home">
+<div id="home" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -172,6 +172,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.uri
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.timeline[0].uri
+          }
+          break
+      }
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue
index 622fefe9..2b2d59e3 100644
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="local">
+<div id="local" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -171,6 +171,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.uri
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.timeline[0].uri
+          }
+          break
+      }
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue
index 71837a5c..4b1fb1f8 100644
--- a/src/renderer/components/TimelineSpace/Contents/Public.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Public.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="public">
+<div id="public" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -194,6 +194,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.uri
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.timeline[0].uri
+          }
+          break
+      }
     }
   }
 }