nbsp/pleroma-fe
1
1
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Wiki Activity

Fixed collapseMessageWithSubjectLocal always using instance-provided config.

Browse source
This commit is contained in:
Henry Jameson 2018-09-03 22:40:45 +03:00
parent d4f9d21857
commit 6e64324d37
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/components/settings/settings.js
View file

@ -6,21 +6,25 @@ import { filter, trim } from 'lodash'
const settings = { const settings = {
data () { data () {
const config = this.$store.state.config
return { return {
hideAttachmentsLocal: this.$store.state.config.hideAttachments, hideAttachmentsLocal: config.hideAttachments,
hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv, hideAttachmentsInConvLocal: config.hideAttachmentsInConv,
hideNsfwLocal: this.$store.state.config.hideNsfw, hideNsfwLocal: config.hideNsfw,
notificationVisibilityLocal: this.$store.state.config.notificationVisibility, notificationVisibilityLocal: config.notificationVisibility,
replyVisibilityLocal: this.$store.state.config.replyVisibility, replyVisibilityLocal: config.replyVisibility,
loopVideoLocal: this.$store.state.config.loopVideo, loopVideoLocal: config.loopVideo,
loopVideoSilentOnlyLocal: this.$store.state.config.loopVideoSilentOnly, loopVideoSilentOnlyLocal: config.loopVideoSilentOnly,
muteWordsString: this.$store.state.config.muteWords.join('\n'), muteWordsString: config.muteWords.join('\n'),
autoLoadLocal: this.$store.state.config.autoLoad, autoLoadLocal: config.autoLoad,
streamingLocal: this.$store.state.config.streaming, streamingLocal: config.streaming,
pauseOnUnfocusedLocal: this.$store.state.config.pauseOnUnfocused, pauseOnUnfocusedLocal: config.pauseOnUnfocused,
hoverPreviewLocal: this.$store.state.config.hoverPreview, hoverPreviewLocal: config.hoverPreview,
collapseMessageWithSubjectLocal: this.$store.state.config.collapseMessageWithSubject, collapseMessageWithSubjectLocal: typeof config.collapseMessageWithSubject === 'undefined'
stopGifs: this.$store.state.config.stopGifs, ? config.defaultCollapseMessageWithSubject
: config.collapseMessageWithSubject,
stopGifs: config.stopGifs,
loopSilentAvailable: loopSilentAvailable:
// Firefox // Firefox
Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') || Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||