diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-09-08 21:19:28 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-09-08 21:19:28 +0900 |
| commit | a7b710a2f8df922ffa99f7f0af8e438efaf7edd3 (patch) | |
| tree | d828e09ac9b0c7682e07c336f60160cf48bbdc50 /src/client/app | |
| parent | AP Undo Announce (#5400) (diff) | |
| download | sharkey-a7b710a2f8df922ffa99f7f0af8e438efaf7edd3.tar.gz sharkey-a7b710a2f8df922ffa99f7f0af8e438efaf7edd3.tar.bz2 sharkey-a7b710a2f8df922ffa99f7f0af8e438efaf7edd3.zip | |
広告ブロッカーの警告を削除 (#5408)
* remove f*ckadbloack
* follow-buttonが消されないように
* revert version
* remove locales
Diffstat (limited to 'src/client/app')
| -rw-r--r-- | src/client/app/common/scripts/fuck-ad-block.ts | 18 | ||||
| -rw-r--r-- | src/client/app/common/views/components/user-list.vue | 4 | ||||
| -rw-r--r-- | src/client/app/desktop/script.ts | 8 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/user-preview.vue | 4 |
4 files changed, 4 insertions, 30 deletions
diff --git a/src/client/app/common/scripts/fuck-ad-block.ts b/src/client/app/common/scripts/fuck-ad-block.ts deleted file mode 100644 index ba7e5a9f87..0000000000 --- a/src/client/app/common/scripts/fuck-ad-block.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare const fuckAdBlock: any; - -export default ($root: any) => { - require('fuckadblock'); - - function adBlockDetected() { - $root.dialog({ - title: $root.$t('@.adblock.detected'), - text: $root.$t('@.adblock.warning') - }); - } - - if (fuckAdBlock === undefined) { - adBlockDetected(); - } else { - fuckAdBlock.onDetected(adBlockDetected); - } -}; diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue index 69cb65b445..9cf6971338 100644 --- a/src/client/app/common/views/components/user-list.vue +++ b/src/client/app/common/views/components/user-list.vue @@ -18,7 +18,7 @@ <div class="description" v-if="user.description" :title="user.description"> <mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :plain="true" :nowrap="true"/> </div> - <mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/> + <mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/> </div> </div> <button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching"> @@ -134,7 +134,7 @@ export default Vue.extend({ font-size 14px padding-right 40px - > .follow-button + > .koudoku-button position absolute top 8px right 0 diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 15365e9d5d..914e162c9a 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -9,7 +9,6 @@ import VueRouter from 'vue-router'; import './style.styl'; import init from '../init'; -import fuckAdBlock from '../common/scripts/fuck-ad-block'; import composeNotification from '../common/scripts/compose-notification'; import MkHome from './views/home/home.vue'; @@ -203,13 +202,6 @@ init(async (launch, os) => { // Launch the app const [app, _] = launch(router); - if (os.store.getters.isSignedIn) { - /** - * Fuck AD Block - */ - fuckAdBlock(app); - } - /** * Init Notification */ diff --git a/src/client/app/desktop/views/components/user-preview.vue b/src/client/app/desktop/views/components/user-preview.vue index 9d9021c184..9328648ccb 100644 --- a/src/client/app/desktop/views/components/user-preview.vue +++ b/src/client/app/desktop/views/components/user-preview.vue @@ -21,7 +21,7 @@ <p>{{ $t('followers') }}</p><span>{{ u.followersCount }}</span> </div> </div> - <mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/> + <mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/> </template> </div> </template> @@ -156,7 +156,7 @@ export default Vue.extend({ font-size 1em color var(--primary) - > .follow-button + > .koudoku-button position absolute top 8px right 8px |