summaryrefslogtreecommitdiff
path: root/src/client/app/common/scripts
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/common/scripts
parent[Client] Add missing icons (diff)
downloadsharkey-11afa8140c5706c8ad105e50cef63df83db66e7a.tar.gz
sharkey-11afa8140c5706c8ad105e50cef63df83db66e7a.tar.bz2
sharkey-11afa8140c5706c8ad105e50cef63df83db66e7a.zip
[Client] Improve alert component
Diffstat (limited to 'src/client/app/common/scripts')
-rw-r--r--src/client/app/common/scripts/check-for-update.ts2
-rw-r--r--src/client/app/common/scripts/fuck-ad-block.ts7
-rw-r--r--src/client/app/common/scripts/note-mixin.ts7
3 files changed, 8 insertions, 8 deletions
diff --git a/src/client/app/common/scripts/check-for-update.ts b/src/client/app/common/scripts/check-for-update.ts
index 377eccc6b5..7fe9d8d50c 100644
--- a/src/client/app/common/scripts/check-for-update.ts
+++ b/src/client/app/common/scripts/check-for-update.ts
@@ -22,7 +22,7 @@ export default async function($root: any, force = false, silent = false) {
}
if (!silent) {
- $root.$dialog({
+ $root.alert({
title: $root.$t('@.update-available-title'),
text: $root.$t('@.update-available', { newer, current })
});
diff --git a/src/client/app/common/scripts/fuck-ad-block.ts b/src/client/app/common/scripts/fuck-ad-block.ts
index 8d0a3e2785..f5cc1b71f2 100644
--- a/src/client/app/common/scripts/fuck-ad-block.ts
+++ b/src/client/app/common/scripts/fuck-ad-block.ts
@@ -4,12 +4,9 @@ export default ($root: any) => {
require('fuckadblock');
function adBlockDetected() {
- $root.$dialog({
+ $root.alert({
title: $root.$t('@.adblock.detected'),
- text: $root.$t('@.adblock.warning'),
- actins: [{
- text: 'OK'
- }]
+ text: $root.$t('@.adblock.warning')
});
}
diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts
index 9f1a4c6eea..80935927d5 100644
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -3,7 +3,6 @@ import { sum } from '../../../../prelude/array';
import shouldMuteNote from './should-mute-note';
import MkNoteMenu from '../views/components/note-menu.vue';
import MkReactionPicker from '../views/components/reaction-picker.vue';
-import Ok from '../views/components/ok.vue';
function focus(el, fn) {
const target = fn(el);
@@ -142,7 +141,11 @@ export default (opts: Opts = {}) => ({
this.$root.api('notes/favorites/create', {
noteId: this.appearNote.id
}).then(() => {
- this.$root.new(Ok);
+ // TODO
+ /*this.$root.alert({
+ pointer: false,
+ autoClose: true
+ });*/
});
},