summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-29 18:16:02 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-29 18:16:02 +0900
commited130ca82cd66c974f8a561ca3a873bfc4451829 (patch)
treea22a9408ac5693e7b242a168944bfcf22a0393a1
parent:v: (diff)
downloadsharkey-ed130ca82cd66c974f8a561ca3a873bfc4451829.tar.gz
sharkey-ed130ca82cd66c974f8a561ca3a873bfc4451829.tar.bz2
sharkey-ed130ca82cd66c974f8a561ca3a873bfc4451829.zip
Fix bug
-rw-r--r--src/client/app/desktop/views/components/window.vue9
-rw-r--r--src/client/app/init.ts10
2 files changed, 5 insertions, 14 deletions
diff --git a/src/client/app/desktop/views/components/window.vue b/src/client/app/desktop/views/components/window.vue
index 91d1a9c2bf..2e7eb557b4 100644
--- a/src/client/app/desktop/views/components/window.vue
+++ b/src/client/app/desktop/views/components/window.vue
@@ -4,7 +4,7 @@
<div class="main" ref="main" tabindex="-1" :data-is-modal="isModal" @mousedown="onBodyMousedown" @keydown="onKeydown" :style="{ width, height }">
<div class="body">
<header ref="header"
- :class="{ withGradient }"
+ :class="{ withGradient: clientSettings.gradientWindowHeader }"
@contextmenu.prevent="() => {}" @mousedown.prevent="onHeaderMousedown"
>
<h1><slot name="header"></slot></h1>
@@ -91,13 +91,6 @@ export default Vue.extend({
},
canResize(): boolean {
return !this.isFlexible;
- },
- withGradient(): boolean {
- return (this as any).os.isSignedIn
- ? (this as any).clientSettings.gradientWindowHeader != null
- ? (this as any).clientSettings.gradientWindowHeader
- : false
- : false;
}
},
diff --git a/src/client/app/init.ts b/src/client/app/init.ts
index 6f7ce02607..d53e685982 100644
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@@ -3,7 +3,7 @@
*/
import Vue from 'vue';
-import Vuex, { mapState } from 'vuex';
+import Vuex from 'vuex';
import VueRouter from 'vue-router';
import VModal from 'vue-js-modal';
import * as TreeView from 'vue-json-tree-view';
@@ -146,12 +146,10 @@ export default (callback: (launch: (router: VueRouter, api?: (os: MiOS) => API)
return {
os,
api: os.api,
- apis: os.apis
+ apis: os.apis,
+ clientSettings: os.store.state.settings.data
};
- },
- computed: mapState({
- clientSettings: state => state.settings.data
- })
+ }
});
const app = new Vue({