usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

サーバーから切断されましたのダイアログは時間をおいて表示するように (#5916) 

* timeout disconnect dialog

* 70ms

* 150ms
This commit is contained in:
tamaina 2020-02-11 22:57:09 +09:00 committed by GitHub
parent 9fb5579701
commit 10a7369fec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/app.vue
View File

@ -247,11 +247,15 @@ export default Vue.extend({
} }
this.$root.stream.on('_disconnected_', () => { this.$root.stream.on('_disconnected_', () => {
if (!this.disconnectedDialog) { if (this.disconnectedDialog) return;
if (this.$store.state.device.autoReload) { if (this.$store.state.device.autoReload) {
location.reload(); location.reload();
return; return;
} }
setTimeout(() => {
if (this.$root.stream.state !== 'reconnecting') return;
this.disconnectedDialog = this.$root.dialog({ this.disconnectedDialog = this.$root.dialog({
type: 'warning', type: 'warning',
showCancelButton: true, showCancelButton: true,
@ -263,7 +267,7 @@ export default Vue.extend({
} }
this.disconnectedDialog = null; this.disconnectedDialog = null;
}); });
} }, 150)
}); });
}, },

2
src/client/scripts/stream.ts
View File

@ -9,7 +9,7 @@ import MiOS from '../mios';
*/ */
export default class Stream extends EventEmitter { export default class Stream extends EventEmitter {
private stream: ReconnectingWebsocket; private stream: ReconnectingWebsocket;
public state: string; public state: 'initializing' | 'reconnecting' | 'connected';
private sharedConnectionPools: Pool[] = []; private sharedConnectionPools: Pool[] = [];
private sharedConnections: SharedConnection[] = []; private sharedConnections: SharedConnection[] = [];
private nonSharedConnections: NonSharedConnection[] = []; private nonSharedConnections: NonSharedConnection[] = [];