summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-09 18:25:21 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-09 18:25:21 +0900
commit0b53ef9bae939c0e23d136f1c93e1bce09af73cd (patch)
tree9279fab08136c491f65acfb5d0c36928053e6a52 /src
parentRefactor client (#3178) (diff)
downloadsharkey-0b53ef9bae939c0e23d136f1c93e1bce09af73cd.tar.gz
sharkey-0b53ef9bae939c0e23d136f1c93e1bce09af73cd.tar.bz2
sharkey-0b53ef9bae939c0e23d136f1c93e1bce09af73cd.zip
[Client] Fix bug
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/components/ui.header.account.vue2
-rw-r--r--src/client/app/desktop/views/components/ui.sidebar.vue2
-rw-r--r--src/client/app/init.ts1
-rw-r--r--src/client/app/mobile/views/pages/settings.vue3
4 files changed, 5 insertions, 3 deletions
diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
index 97496c6e18..79410273aa 100644
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -155,7 +155,7 @@ export default Vue.extend({
this.$root.new(MkSettingsWindow);
},
signout() {
- this.$root.os.signout();
+ this.$root.signout();
},
dark() {
this.$store.commit('device/set', {
diff --git a/src/client/app/desktop/views/components/ui.sidebar.vue b/src/client/app/desktop/views/components/ui.sidebar.vue
index 76990fa5a4..5b46460114 100644
--- a/src/client/app/desktop/views/components/ui.sidebar.vue
+++ b/src/client/app/desktop/views/components/ui.sidebar.vue
@@ -162,7 +162,7 @@ export default Vue.extend({
},
signout() {
- this.$root.os.signout();
+ this.$root.signout();
},
notifications() {
diff --git a/src/client/app/init.ts b/src/client/app/init.ts
index d5833019db..80451f696a 100644
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@@ -290,6 +290,7 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS]) => void,
api: os.api,
getMeta: os.getMeta,
getMetaSync: os.getMetaSync,
+ signout: os.signout,
new(vm, props) {
const x = new vm({
parent: this,
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index 445471200a..11fa3c31b1 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -24,6 +24,7 @@
<ui-switch v-model="contrastedAcct">{{ $t('contrasted-acct') }}</ui-switch>
<ui-switch v-model="showFullAcct">{{ $t('@.show-full-acct') }}</ui-switch>
<ui-switch v-model="useOsDefaultEmojis">{{ $t('@.use-os-default-emojis') }}</ui-switch>
+ <ui-switch v-model="useOsDefaultEmojis">{{ $t('@.use-os-default-emojis') }}</ui-switch>
<ui-switch v-model="iLikeSushi">{{ $t('@.i-like-sushi') }}</ui-switch>
<ui-switch v-model="disableAnimatedMfm">{{ $t('@.disable-animated-mfm') }}</ui-switch>
<ui-switch v-model="alwaysShowNsfw">{{ $t('@.always-show-nsfw') }} ({{ $t('@.this-setting-is-this-device-only') }})</ui-switch>
@@ -334,7 +335,7 @@ export default Vue.extend({
methods: {
signout() {
- this.$root.os.signout();
+ this.$root.signout();
},
checkForUpdate() {