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/mobile | |
| 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/mobile')
6 files changed, 24 insertions, 8 deletions
diff --git a/src/client/app/mobile/views/components/drive.file-detail.vue b/src/client/app/mobile/views/components/drive.file-detail.vue index 98124354ed..b9960e5433 100644 --- a/src/client/app/mobile/views/components/drive.file-detail.vue +++ b/src/client/app/mobile/views/components/drive.file-detail.vue @@ -136,7 +136,10 @@ export default Vue.extend({ }, showCreatedAt() { - alert(new Date(this.file.createdAt).toLocaleString()); + this.$root.dialog({ + type: 'info', + text: (new Date(this.file.createdAt)).toLocaleString() + }); } } }); @@ -150,11 +153,13 @@ export default Vue.extend({ > .preview width fit-content + width -moz-fit-content max-width 100% margin 0 auto box-shadow 1px 1px 4px rgba(#000, 0.2) overflow hidden color var(--driveFileIcon) + justify-content center > footer padding 8px 8px 0 8px diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue index 6b26cdf890..82cbdcc547 100644 --- a/src/client/app/mobile/views/components/post-form.vue +++ b/src/client/app/mobile/views/components/post-form.vue @@ -283,14 +283,21 @@ export default Vue.extend({ setGeo() { if (navigator.geolocation == null) { - alert(this.$t('location-alert')); + this.$root.dialog({ + type: 'warning', + text: this.$t('geolocation-alert') + }); return; } navigator.geolocation.getCurrentPosition(pos => { this.geo = pos.coords; }, 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/mobile/views/pages/favorites.vue b/src/client/app/mobile/views/pages/favorites.vue index 6f175a0053..92823db7cc 100644 --- a/src/client/app/mobile/views/pages/favorites.vue +++ b/src/client/app/mobile/views/pages/favorites.vue @@ -32,7 +32,7 @@ export default Vue.extend({ this.fetch(); }, mounted() { - document.title = `${this.$root.instanceName} | %i18n:@notifications%`; + document.title = `${this.$root.instanceName} | ${this.$t('@.favorites')}`; }, methods: { fetch() { diff --git a/src/client/app/mobile/views/pages/games/reversi.vue b/src/client/app/mobile/views/pages/games/reversi.vue index c67e3fadd1..69b7bdffb4 100644 --- a/src/client/app/mobile/views/pages/games/reversi.vue +++ b/src/client/app/mobile/views/pages/games/reversi.vue @@ -15,7 +15,7 @@ export default Vue.extend({ XReversi: () => import('../../../../common/views/components/games/reversi/reversi.vue').then(m => m.default) }, mounted() { - document.title = `${this.$root.instanceName} %i18n:@reversi%`; + document.title = `${this.$root.instanceName} | ${this.$t('reversi')}`; }, methods: { nav(game, actualNav) { diff --git a/src/client/app/mobile/views/pages/search.vue b/src/client/app/mobile/views/pages/search.vue index f4b2512809..0225dd9e9f 100644 --- a/src/client/app/mobile/views/pages/search.vue +++ b/src/client/app/mobile/views/pages/search.vue @@ -50,7 +50,7 @@ export default Vue.extend({ } }, mounted() { - document.title = `%i18n:@search%: ${this.q} | ${this.$root.instanceName}`; + document.title = `${this.$t('search')}: ${this.q} | ${this.$root.instanceName}`; }, methods: { inited() { diff --git a/src/client/app/mobile/views/pages/widgets.vue b/src/client/app/mobile/views/pages/widgets.vue index 2647f96de2..33166825cb 100644 --- a/src/client/app/mobile/views/pages/widgets.vue +++ b/src/client/app/mobile/views/pages/widgets.vue @@ -29,7 +29,8 @@ </header> <x-draggable :list="widgets" - :options="{ handle: '.handle', animation: 150 }" + handle=".handle" + animation="150" @sort="onWidgetSort" > <div v-for="widget in widgets" class="customize-container" :key="widget.id"> @@ -106,7 +107,10 @@ export default Vue.extend({ methods: { hint() { - alert(this.$t('widgets-hints')); + this.$root.dialog({ + type: 'info', + text: this.$t('widgets-hints') + }); }, widgetFunc(id) { |