diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2019-04-16 13:05:10 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-04-16 13:05:10 +0900 |
| commit | f966d0b32c9cd45b531a4d76f01bf008e5136bd0 (patch) | |
| tree | 295f1971d10a94ae8e7a5230d94276e78be8afcd /src/client/app/desktop/views | |
| parent | Fix: admin/driveのアイコンがずれてる (#4710) (diff) | |
| download | misskey-f966d0b32c9cd45b531a4d76f01bf008e5136bd0.tar.gz misskey-f966d0b32c9cd45b531a4d76f01bf008e5136bd0.tar.bz2 misskey-f966d0b32c9cd45b531a4d76f01bf008e5136bd0.zip | |
色々な修正; Fix #4709 (#4714)
* Fix a la carte 1
* use dialog instead of alert() etc
Diffstat (limited to 'src/client/app/desktop/views')
5 files changed, 21 insertions, 7 deletions
diff --git a/src/client/app/desktop/views/components/drive.folder.vue b/src/client/app/desktop/views/components/drive.folder.vue index 02f219a98e..fd6de5a05e 100644 --- a/src/client/app/desktop/views/components/drive.folder.vue +++ b/src/client/app/desktop/views/components/drive.folder.vue @@ -161,7 +161,10 @@ export default Vue.extend({ }); break; default: - alert(this.$t('unhandled-error')); + this.$root.dialog({ + type: 'error', + text: this.$t('unhandled-error') + }); } }); } diff --git a/src/client/app/desktop/views/components/drive.vue b/src/client/app/desktop/views/components/drive.vue index fcabb4b8eb..48443669ac 100644 --- a/src/client/app/desktop/views/components/drive.vue +++ b/src/client/app/desktop/views/components/drive.vue @@ -320,7 +320,10 @@ export default Vue.extend({ }); break; default: - alert(this.$t('unhandled-error')); + this.$root.dialog({ + type: 'error', + text: this.$t('unhandled-error') + }); } }); } diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index fe39a17e67..7d3593d9c9 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -364,7 +364,10 @@ export default Vue.extend({ setGeo() { if (navigator.geolocation == null) { - alert(this.$t('geolocation-alert')); + this.$root.dialog({ + type: 'warning', + text: this.$t('geolocation-alert') + }); return; } @@ -372,7 +375,11 @@ export default Vue.extend({ this.geo = pos.coords; this.$emit('geo-attached', this.geo); }, err => { - alert(`%i18n:@error%: ${err.message}`); + this.$root.dialog({ + type: 'error', + title: this.$t('error') + text: err.message + }); }, { enableHighAccuracy: true }); diff --git a/src/client/app/desktop/views/home/home.vue b/src/client/app/desktop/views/home/home.vue index d0b2fc10bc..d4677df842 100644 --- a/src/client/app/desktop/views/home/home.vue +++ b/src/client/app/desktop/views/home/home.vue @@ -34,7 +34,7 @@ <button @click="addWidget">{{ $t('add') }}</button> </div> <div class="trash"> - <x-draggable v-model="trash" :options="{ group: 'x' }" @add="onTrash"></x-draggable> + <x-draggable v-model="trash" group="x" @add="onTrash"></x-draggable> <p>{{ $t('@.trash') }}</p> </div> </div> @@ -45,7 +45,8 @@ :list="widgets[place]" :class="place" :data-place="place" - :options="{ group: 'x', animation: 150 }" + group="x" + animation="150" @sort="onWidgetSort" :key="place" > diff --git a/src/client/app/desktop/views/pages/drive.vue b/src/client/app/desktop/views/pages/drive.vue index 2916569a5f..b389392ec8 100644 --- a/src/client/app/desktop/views/pages/drive.vue +++ b/src/client/app/desktop/views/pages/drive.vue @@ -34,7 +34,7 @@ export default Vue.extend({ document.title = title; }, onOpenFolder(folder) { - const title = folder.name + ' | %i18n:@title%'; + const title = `${folder.name} | ${this.$t('title')}`; // Rewrite URL history.pushState(null, title, `/i/drive/folder/${folder.id}`); |