Merge pull request #730 from Half-Shot/hs/video-gif-autoplay

Autoplay videos and GIFs if enabled by the user.
2017-03-02 13:41:30 +00:00
parent 0035a91596 4b5e8d66b8
commit 8be66d0f04
3 changed files with 34 additions and 20 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -39,6 +39,10 @@ const REACT_SDK_VERSION =
 // 'id' gives the key name in the im.vector.web.settings account data event
 // 'label' is how we describe it in the UI.
 const SETTINGS_LABELS = [
+    {
+        id: 'autoplayGifsAndVideos',
+        label: 'Autoplay GIFs and videos',
+    },
 /*
    {
        id: 'alwaysShowTimestamps',