sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Default video inlining true and make the config stuff work

This commit is contained in:
shpuld 2019-01-31 21:01:10 +02:00
parent fbe7af3d56
commit bb2ff977a5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/boot/after_store.js
View File

@ -86,6 +86,7 @@ const afterStoreSetup = ({ store, i18n }) => {
copyInstanceOption('subjectLineBehavior') copyInstanceOption('subjectLineBehavior')
copyInstanceOption('alwaysShowSubjectInput') copyInstanceOption('alwaysShowSubjectInput')
copyInstanceOption('noAttachmentLinks') copyInstanceOption('noAttachmentLinks')
copyInstanceOption('playVideosInline')
if ((config.chatDisabled)) { if ((config.chatDisabled)) {
store.dispatch('disableChat') store.dispatch('disableChat')

4
src/components/settings/settings.js
View File

@ -66,7 +66,9 @@ const settings = {
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') || Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') ||
// Future spec, still not supported in Nightly 63 as of 08/2018 // Future spec, still not supported in Nightly 63 as of 08/2018
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'), Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
playVideosInline: user.playVideosInline, playVideosInline: typeof user.playVideosInline === 'undefined'
? instance.playVideosInline
: user.playVideosInline,
useContainFit: user.useContainFit useContainFit: user.useContainFit
} }
}, },

4
static/config.json
View File

@ -20,7 +20,5 @@
"webPushNotifications": false, "webPushNotifications": false,
"noAttachmentLinks": false, "noAttachmentLinks": false,
"nsfwCensorImage": "", "nsfwCensorImage": "",
"useOneClickNsfw": true, "playVideosInline": true,
"playVideosInline": false,
"useContainFit": false
} }