summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2020-02-11 22:57:09 +0900
committerGitHub <noreply@github.com>2020-02-11 22:57:09 +0900
commit10a7369fecf852546c93e10936dacb3ef99e91fd (patch)
tree6cfd7898bca003ebbcf89729fe57299037196a3c /src/client
parent12.7.1 (diff)
downloadsharkey-10a7369fecf852546c93e10936dacb3ef99e91fd.tar.gz
sharkey-10a7369fecf852546c93e10936dacb3ef99e91fd.tar.bz2
sharkey-10a7369fecf852546c93e10936dacb3ef99e91fd.zip
サーバーから切断されましたのダイアログは時間をおいて表示するように (#5916)
* timeout disconnect dialog * 70ms * 150ms
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app.vue16
-rw-r--r--src/client/scripts/stream.ts2
2 files changed, 11 insertions, 7 deletions
diff --git a/src/client/app.vue b/src/client/app.vue
index 32283bd20c..7b4796d747 100644
--- a/src/client/app.vue
+++ b/src/client/app.vue
@@ -247,11 +247,15 @@ export default Vue.extend({
}
this.$root.stream.on('_disconnected_', () => {
- if (!this.disconnectedDialog) {
- if (this.$store.state.device.autoReload) {
- location.reload();
- return;
- }
+ if (this.disconnectedDialog) return;
+ if (this.$store.state.device.autoReload) {
+ location.reload();
+ return;
+ }
+
+ setTimeout(() => {
+ if (this.$root.stream.state !== 'reconnecting') return;
+
this.disconnectedDialog = this.$root.dialog({
type: 'warning',
showCancelButton: true,
@@ -263,7 +267,7 @@ export default Vue.extend({
}
this.disconnectedDialog = null;
});
- }
+ }, 150)
});
},
diff --git a/src/client/scripts/stream.ts b/src/client/scripts/stream.ts
index 7f0e1280b6..18bb7c13df 100644
--- a/src/client/scripts/stream.ts
+++ b/src/client/scripts/stream.ts
@@ -9,7 +9,7 @@ import MiOS from '../mios';
*/
export default class Stream extends EventEmitter {
private stream: ReconnectingWebsocket;
- public state: string;
+ public state: 'initializing' | 'reconnecting' | 'connected';
private sharedConnectionPools: Pool[] = [];
private sharedConnections: SharedConnection[] = [];
private nonSharedConnections: NonSharedConnection[] = [];