diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-03 09:14:42 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-03 09:14:42 +0000 |
| commit | e4b2fdf1240571f1a3d4be743d73d2b8207b7ba6 (patch) | |
| tree | 8d21d76ef7471df36b3e0468e06b3870b280c714 /src/components/settings | |
| parent | 214dd1f6d14073c26316bf5344f03b4b6af999b2 (diff) | |
| parent | 0c4dc26808c3bb7508bf9005f3c3430f1c7e2039 (diff) | |
Merge branch 'stillGifs' into 'develop'
Still gifs
See merge request pleroma/pleroma-fe!193
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/settings.js | 6 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index b88937bb..a26111d6 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -10,7 +10,8 @@ const settings = { muteWordsString: this.$store.state.config.muteWords.join('\n'), autoLoadLocal: this.$store.state.config.autoLoad, streamingLocal: this.$store.state.config.streaming, - hoverPreviewLocal: this.$store.state.config.hoverPreview + hoverPreviewLocal: this.$store.state.config.hoverPreview, + stopGifs: this.$store.state.config.stopGifs } }, components: { @@ -43,6 +44,9 @@ const settings = { muteWordsString (value) { value = filter(value.split('\n'), (word) => trim(word).length > 0) this.$store.dispatch('setOption', { name: 'muteWords', value }) + }, + stopGifs (value) { + this.$store.dispatch('setOption', { name: 'stopGifs', value }) } } } diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 8fdd09de..5aa7596a 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -29,8 +29,8 @@ <label for="hideNsfw">{{$t('settings.nsfw_clickthrough')}}</label> </li> <li> - <input type="checkbox" id="autoLoad" v-model="autoLoadLocal"> - <label for="autoLoad">{{$t('settings.autoload')}}</label> + <input type="checkbox" id="autoload" v-model="autoloadlocal"> + <label for="autoload">{{$t('settings.autoload')}}</label> </li> <li> <input type="checkbox" id="streaming" v-model="streamingLocal"> @@ -40,6 +40,10 @@ <input type="checkbox" id="hoverPreview" v-model="hoverPreviewLocal"> <label for="hoverPreview">{{$t('settings.reply_link_preview')}}</label> </li> + <li> + <input type="checkbox" id="stopGifs" v-model="stopGifs"> + <label for="stopGifs">{{$t('settings.stop_gifs')}}</label> + </li> </ul> </div> </div> |