色々な修正; Fix #4709 (#4714)

* Fix a la carte 1

* use dialog instead of alert() etc
This commit is contained in:
tamaina
2019-04-16 13:05:10 +09:00
committed by syuilo
parent ba3879a95a
commit f966d0b32c
21 changed files with 79 additions and 29 deletions

View File

@ -85,7 +85,10 @@ export default Vue.extend({
}
} else {
if (items[0].kind == 'file') {
alert(this.$t('only-one-file-attached'));
this.$root.dialog({
type: 'error',
text: this.$t('only-one-file-attached')
});
}
}
},
@ -107,7 +110,10 @@ export default Vue.extend({
return;
} else if (e.dataTransfer.files.length > 1) {
e.preventDefault();
alert(this.$t('only-one-file-attached'));
this.$root.dialog({
type: 'error',
text: this.$t('only-one-file-attached')
});
return;
}

View File

@ -125,7 +125,10 @@ export default Vue.extend({
this.form.upload(e.dataTransfer.files[0]);
return;
} else if (e.dataTransfer.files.length > 1) {
alert(this.$t('only-one-file-attached'));
this.$root.dialog({
type: 'error',
text: this.$t('only-one-file-attached')
});
return;
}

View File

@ -1,6 +1,6 @@
<template>
<div class="skeikyzd" v-show="files.length != 0">
<x-draggable class="files" :list="files" :options="{ animation: 150 }">
<x-draggable class="files" :list="files" animation="150">
<div v-for="file in files" :key="file.id" @click="showFileMenu(file, $event)" @contextmenu.prevent="showFileMenu(file, $event)">
<x-file-thumbnail :data-id="file.id" class="thumbnail" :file="file" fit="cover"/>
<img class="remove" @click.stop="detachMedia(file.id)" src="/assets/desktop/remove.png" :title="$t('attach-cancel')" alt=""/>

View File

@ -542,8 +542,8 @@ export default Vue.extend({
this.latestVersion = newer;
if (newer == null) {
this.$root.dialog({
title: this.$t('no-updates'),
text: this.$t('no-updates-desc')
title: this.$t('@._settings.no-updates'),
text: this.$t('@._settings.no-updates-desc')
});
} else {
this.$root.dialog({

View File

@ -79,7 +79,10 @@ export default Vue.extend({
localStorage.setItem('i', res.i);
location.reload();
}).catch(() => {
alert(this.$t('login-failed'));
this.$root.dialog({
type: 'error',
text: this.$t('login-failed')
});
this.signing = false;
});
}

View File

@ -153,7 +153,10 @@ export default Vue.extend({
location.href = '/';
});
}).catch(() => {
alert(this.$t('some-error'));
this.$root.dialog({
type: 'error',
text: this.$t('some-error')
});
if (this.meta.enableRecaptcha) {
(window as any).grecaptcha.reset();