summaryrefslogtreecommitdiff
path: root/src/client/app/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/app/common')
-rw-r--r--src/client/app/common/mios.ts15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/client/app/common/mios.ts b/src/client/app/common/mios.ts
index 6d6d6b3e68..6fed267d6e 100644
--- a/src/client/app/common/mios.ts
+++ b/src/client/app/common/mios.ts
@@ -16,6 +16,14 @@ import Err from '../common/views/components/connect-failed.vue';
import { LocalTimelineStreamManager } from './scripts/streaming/local-timeline';
import { GlobalTimelineStreamManager } from './scripts/streaming/global-timeline';
+const defaultSettings = {
+ fetchOnScroll: true,
+ showMaps: true,
+ showPostFormOnTopOfTl: false,
+ gradientWindowHeader: false,
+ showReplyTarget: true
+};
+
//#region api requests
let spinner = null;
let pending = 0;
@@ -298,12 +306,7 @@ export default class MiOS extends EventEmitter {
const fetched = me => {
if (me) {
// デフォルトの設定をマージ
- me.clientSettings = Object.assign({
- fetchOnScroll: true,
- showMaps: true,
- showPostFormOnTopOfTl: false,
- gradientWindowHeader: false
- }, me.clientSettings);
+ me.clientSettings = Object.assign(defaultSettings, me.clientSettings);
// ローカルストレージにキャッシュ
localStorage.setItem('me', JSON.stringify(me));