From 87801766f467796b9cc13685f3794068cee4724b Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 14 Apr 2018 21:53:17 +0900
Subject: [PATCH 1/5] fix: Handle error when lazy loading in favourite
---
.../components/TimelineSpace/Contents/Favourites.vue | 6 ++++++
src/renderer/store/TimelineSpace/Contents/Favourites.js | 3 +++
2 files changed, 9 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Contents/Favourites.vue b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
index b321f6f5..40feebac 100644
--- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
@@ -57,6 +57,12 @@ export default {
onScroll (event) {
if (((event.target.clientHeight + event.target.scrollTop) >= document.getElementById('favourites').clientHeight - 10) && !this.lazyloading) {
this.$store.dispatch('TimelineSpace/Contents/Favourites/lazyFetchFavourites', this.favourites[this.favourites.length - 1])
+ .catch(() => {
+ this.$message({
+ message: 'Could not fetch favourites',
+ type: 'error'
+ })
+ })
}
}
}
diff --git a/src/renderer/store/TimelineSpace/Contents/Favourites.js b/src/renderer/store/TimelineSpace/Contents/Favourites.js
index 83469895..38719704 100644
--- a/src/renderer/store/TimelineSpace/Contents/Favourites.js
+++ b/src/renderer/store/TimelineSpace/Contents/Favourites.js
@@ -50,6 +50,9 @@ const Favourites = {
})
},
lazyFetchFavourites ({ state, commit, rootState }, last) {
+ if (last === undefined || last === null) {
+ return null
+ }
return new Promise((resolve, reject) => {
if (state.lazyLoading) {
return resolve()
From 09bd6f20eaebe5212984d3274f68832c71dd65e6 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 14 Apr 2018 21:55:22 +0900
Subject: [PATCH 2/5] fix: Handle error when lazy loading in home
---
src/renderer/components/TimelineSpace/Contents/Home.vue | 6 ++++++
src/renderer/store/TimelineSpace/Contents/Home.js | 3 +++
2 files changed, 9 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue
index 36029a14..a1602dde 100644
--- a/src/renderer/components/TimelineSpace/Contents/Home.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Home.vue
@@ -41,6 +41,12 @@ export default {
onScroll (event) {
if (((event.target.clientHeight + event.target.scrollTop) >= document.getElementById('home').clientHeight - 10) && !this.lazyloading) {
this.$store.dispatch('TimelineSpace/Contents/Home/lazyFetchTimeline', this.timeline[this.timeline.length - 1])
+ .catch(() => {
+ this.$message({
+ message: 'Could not fetch home timeline',
+ type: 'error'
+ })
+ })
}
}
}
diff --git a/src/renderer/store/TimelineSpace/Contents/Home.js b/src/renderer/store/TimelineSpace/Contents/Home.js
index ff0b6d2a..8c33761c 100644
--- a/src/renderer/store/TimelineSpace/Contents/Home.js
+++ b/src/renderer/store/TimelineSpace/Contents/Home.js
@@ -12,6 +12,9 @@ const Home = {
},
actions: {
lazyFetchTimeline ({ state, commit, rootState }, last) {
+ if (last === undefined || last === null) {
+ return null
+ }
return new Promise((resolve, reject) => {
if (state.lazyLoading) {
return resolve()
From fb64cd661488cdf60df5456c482e938e17e2c119 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 14 Apr 2018 21:57:21 +0900
Subject: [PATCH 3/5] fix: Handle error when lazy loading in notification
---
.../components/TimelineSpace/Contents/Notifications.vue | 6 ++++++
src/renderer/store/TimelineSpace/Contents/Notifications.js | 3 +++
2 files changed, 9 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
index bf9917f8..c04b32b1 100644
--- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
@@ -41,6 +41,12 @@ export default {
onScroll (event) {
if (((event.target.clientHeight + event.target.scrollTop) >= document.getElementById('notifications').clientHeight - 10) && !this.lazyloading) {
this.$store.dispatch('TimelineSpace/Contents/Notifications/lazyFetchNotifications', this.notifications[this.notifications.length - 1])
+ .catch(() => {
+ this.$message({
+ message: 'Could not fetch notification',
+ type: 'error'
+ })
+ })
}
}
}
diff --git a/src/renderer/store/TimelineSpace/Contents/Notifications.js b/src/renderer/store/TimelineSpace/Contents/Notifications.js
index ed75ccb4..b6ac9c87 100644
--- a/src/renderer/store/TimelineSpace/Contents/Notifications.js
+++ b/src/renderer/store/TimelineSpace/Contents/Notifications.js
@@ -12,6 +12,9 @@ const Notifications = {
},
actions: {
lazyFetchNotifications ({ state, commit, rootState }, last) {
+ if (last === undefined || last === null) {
+ return null
+ }
return new Promise((resolve, reject) => {
if (state.lazyLoading) {
return resolve()
From 5950db40fb1453e4bcfd7d434d1f2546ef257d61 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 14 Apr 2018 21:58:53 +0900
Subject: [PATCH 4/5] fix: Handle error when lazy loading in local
---
src/renderer/components/TimelineSpace/Contents/Local.vue | 6 ++++++
src/renderer/store/TimelineSpace/Contents/Local.js | 3 +++
2 files changed, 9 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue
index d1e30599..c0545589 100644
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@@ -70,6 +70,12 @@ export default {
onScroll (event) {
if (((event.target.clientHeight + event.target.scrollTop) >= document.getElementById('local').clientHeight - 10) && !this.lazyloading) {
this.$store.dispatch('TimelineSpace/Contents/Local/lazyFetchTimeline', this.timeline[this.timeline.length - 1])
+ .catch(() => {
+ this.$message({
+ message: 'Could not fetch timeline',
+ type: 'error'
+ })
+ })
}
}
}
diff --git a/src/renderer/store/TimelineSpace/Contents/Local.js b/src/renderer/store/TimelineSpace/Contents/Local.js
index 15eb16a0..a9f73d4e 100644
--- a/src/renderer/store/TimelineSpace/Contents/Local.js
+++ b/src/renderer/store/TimelineSpace/Contents/Local.js
@@ -70,6 +70,9 @@ const Local = {
ipcRenderer.send('stop-local-streaming')
},
lazyFetchTimeline ({ state, commit, rootState }, last) {
+ if (last === undefined || last === null) {
+ return null
+ }
return new Promise((resolve, reject) => {
if (state.lazyLoading) {
return resolve()
From 85c77e4aa35b1550272265902db04ad90f833eb7 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 14 Apr 2018 22:00:59 +0900
Subject: [PATCH 5/5] fix: Handle error when lazy loading in public
---
src/renderer/components/TimelineSpace/Contents/Public.vue | 6 ++++++
src/renderer/store/TimelineSpace/Contents/Public.js | 3 +++
2 files changed, 9 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue
index 9bee9d24..a8e6e8f7 100644
--- a/src/renderer/components/TimelineSpace/Contents/Public.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Public.vue
@@ -70,6 +70,12 @@ export default {
onScroll (event) {
if (((event.target.clientHeight + event.target.scrollTop) >= document.getElementById('public').clientHeight - 10) && !this.lazyloading) {
this.$store.dispatch('TimelineSpace/Contents/Public/lazyFetchTimeline', this.timeline[this.timeline.length - 1])
+ .catch(() => {
+ this.$message({
+ message: 'Could not fetch timeline',
+ type: 'error'
+ })
+ })
}
}
}
diff --git a/src/renderer/store/TimelineSpace/Contents/Public.js b/src/renderer/store/TimelineSpace/Contents/Public.js
index 6e583b79..7f19d98c 100644
--- a/src/renderer/store/TimelineSpace/Contents/Public.js
+++ b/src/renderer/store/TimelineSpace/Contents/Public.js
@@ -70,6 +70,9 @@ const Public = {
ipcRenderer.send('stop-public-streaming')
},
lazyFetchTimeline ({ state, commit, rootState }, last) {
+ if (last === undefined || last === null) {
+ return null
+ }
return new Promise((resolve, reject) => {
if (state.lazyLoading) {
return resolve()