diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-05-03 18:33:25 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-05-03 18:33:25 +0900 |
| commit | 9d1ed1eb0dfce53aa0db7f33f376774b1521a5ae (patch) | |
| tree | 44aaed1fa2d22709fb5dea47aa83f357905d79b6 /src/client | |
| parent | Merge branch 'develop' of https://github.com/syuilo/misskey into develop (diff) | |
| download | sharkey-9d1ed1eb0dfce53aa0db7f33f376774b1521a5ae.tar.gz sharkey-9d1ed1eb0dfce53aa0db7f33f376774b1521a5ae.tar.bz2 sharkey-9d1ed1eb0dfce53aa0db7f33f376774b1521a5ae.zip | |
Some import and export fixes (#4842)
* Fix: Mastodon v2.8.0 のフォローリストがインポートできない
* Fix: エクスポートリクエストに失敗してもエラーが出ない (#4821)
* エクスポートファイルでは同一ハッシュチェックをしないように
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/settings/profile.vue | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/client/app/common/views/components/settings/profile.vue b/src/client/app/common/views/components/settings/profile.vue index c1ecfafe16..a22fd6df98 100644 --- a/src/client/app/common/views/components/settings/profile.vue +++ b/src/client/app/common/views/components/settings/profile.vue @@ -290,12 +290,17 @@ export default Vue.extend({ this.exportTarget == 'mute' ? 'i/export-mute' : this.exportTarget == 'blocking' ? 'i/export-blocking' : this.exportTarget == 'user-lists' ? 'i/export-user-lists' : - null, {}); - - this.$root.dialog({ - type: 'info', - text: this.$t('export-requested') - }); + null, {}).then(() => { + this.$root.dialog({ + type: 'info', + text: this.$t('export-requested') + }); + }).catch((e: any) => { + this.$root.dialog({ + type: 'error', + text: e.message + }); + }); }, doImport() { |