From fa8a08f016bd72895dc15602ee021b20054d5c57 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 18 Apr 2018 07:35:56 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=81=A7=E3=83=AA=E3=83=97=E3=83=A9=E3=82=A4=E5=85=88?= =?UTF-8?q?=E3=81=AE=E6=8A=95=E7=A8=BF=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=8B=E5=90=A6=E3=81=8B=E8=A8=AD=E5=AE=9A=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/common/mios.ts | 15 +++++++++------ .../app/desktop/views/components/notes.note.vue | 2 +- .../app/desktop/views/components/settings.vue | 7 +++++++ src/client/app/mobile/views/components/note.vue | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/client/app/common/mios.ts b/src/client/app/common/mios.ts index 6d6d6b3e6..6fed267d6 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)); diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index 070c42352..752242d7d 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -1,6 +1,6 @@