summaryrefslogtreecommitdiff
path: root/src/client/app/mobile/views
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-14 16:30:58 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-14 16:30:58 +0900
commit11afa8140c5706c8ad105e50cef63df83db66e7a (patch)
treed7e322dab3dc20f9ba86681dd7b2354af922fdda /src/client/app/mobile/views
parent[Client] Add missing icons (diff)
downloadmisskey-11afa8140c5706c8ad105e50cef63df83db66e7a.tar.gz
misskey-11afa8140c5706c8ad105e50cef63df83db66e7a.tar.bz2
misskey-11afa8140c5706c8ad105e50cef63df83db66e7a.zip
[Client] Improve alert component
Diffstat (limited to 'src/client/app/mobile/views')
-rw-r--r--src/client/app/mobile/views/components/dialog.vue167
-rw-r--r--src/client/app/mobile/views/pages/settings.vue4
2 files changed, 2 insertions, 169 deletions
diff --git a/src/client/app/mobile/views/components/dialog.vue b/src/client/app/mobile/views/components/dialog.vue
deleted file mode 100644
index ca9ccd8246..0000000000
--- a/src/client/app/mobile/views/components/dialog.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
-<div class="mk-dialog">
- <div class="bg" ref="bg" @click="onBgClick"></div>
- <div class="main" ref="main">
- <header v-html="title" :class="$style.header"></header>
- <div class="body" v-html="text"></div>
- <div class="buttons">
- <button v-for="button in buttons" @click="click(button)">{{ button.text }}</button>
- </div>
- </div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import * as anime from 'animejs';
-
-export default Vue.extend({
- props: {
- title: {
- type: String,
- required: false
- },
- text: {
- type: String,
- required: true
- },
- buttons: {
- type: Array,
- default: () => {
- return [{
- text: 'OK'
- }];
- }
- },
- modal: {
- type: Boolean,
- default: false
- }
- },
- mounted() {
- this.$nextTick(() => {
- (this.$refs.bg as any).style.pointerEvents = 'auto';
- anime({
- targets: this.$refs.bg,
- opacity: 1,
- duration: 100,
- easing: 'linear'
- });
-
- anime({
- targets: this.$refs.main,
- opacity: 1,
- scale: [1.2, 1],
- duration: 300,
- easing: [0, 0.5, 0.5, 1]
- });
- });
- },
- methods: {
- click(button) {
- this.$emit('clicked', button.id);
- this.close();
- },
- close() {
- (this.$refs.bg as any).style.pointerEvents = 'none';
- anime({
- targets: this.$refs.bg,
- opacity: 0,
- duration: 300,
- easing: 'linear'
- });
-
- (this.$refs.main as any).style.pointerEvents = 'none';
- anime({
- targets: this.$refs.main,
- opacity: 0,
- scale: 0.8,
- duration: 300,
- easing: [ 0.5, -0.5, 1, 0.5 ],
- complete: () => this.destroyDom()
- });
- },
- onBgClick() {
- if (!this.modal) {
- this.close();
- }
- }
- }
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-dialog
- > .bg
- display block
- position fixed
- z-index 8192
- top 0
- left 0
- width 100%
- height 100%
- background rgba(#000, 0.7)
- opacity 0
- pointer-events none
-
- > .main
- display block
- position fixed
- z-index 8192
- top 20%
- left 0
- right 0
- margin 0 auto 0 auto
- padding 16px
- width calc(100% - 32px)
- max-width 300px
- background #fff
- opacity 0
-
- > .body
- margin 1em 0
- color #888
-
- > .buttons
- > button
- display inline-block
- float right
- margin 0
- padding 0 10px
- font-size 1.1em
- font-weight normal
- text-decoration none
- color #888
- background transparent
- outline none
- border none
- border-radius 0
- cursor pointer
- transition color 0.1s ease
-
- i
- margin 0 0.375em
-
- &:hover
- color var(--primary)
-
- &:active
- color var(--primaryDarken10)
- transition color 0s ease
-
-</style>
-
-<style lang="stylus" module>
-.header
- margin 0 0 1em 0
- color var(--primary)
- // color #43A4EC
- font-weight bold
-
- &:empty
- display none
-
- > i
- margin-right 0.5em
-
-</style>
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index 2bd64b6270..fceaebc66d 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -360,12 +360,12 @@ export default Vue.extend({
this.checkingForUpdate = false;
this.latestVersion = newer;
if (newer == null) {
- this.$dialog({
+ this.$root.alert({
title: this.$t('no-updates'),
text: this.$t('no-updates-desc')
});
} else {
- this.$dialog({
+ this.$root.alert({
title: this.$t('update-available'),
text: this.$t('update-available-desc')
});