refactor: merge two animation disabling options into one

destinygg · Feb 20, 2024 · 80bf3a2 · 80bf3a2
1 parent 814566f
commit 80bf3a2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/assets/chat/css/style.scss b/assets/chat/css/style.scss
@@ -1717,18 +1717,18 @@ hr {
 .pref-autocompletehelper #chat-auto-complete.active {
   display: block;
 }
-.pref-disableemoteanimations .emote {
-  &,
-  &:hover,
-  &:before,
-  &:after {
+.pref-disableanimations {
+  .emote,
+  .emote:hover,
+  .emote::before,
+  .emote::after {
     animation: none !important;
   }
-}
 
-.pref-disableflairanimations a.user,
-.pref-disableflairanimations span.user {
-  animation: none !important;
+  a.user,
+  span.user {
+    animation: none !important;
+  }
 }
 
 /* OverlayScrollbars theme */

diff --git a/assets/chat/js/const.js b/assets/chat/js/const.js
@@ -133,8 +133,7 @@ const settingsdefault = new Map(
     hidensfl: false,
     fontscale: 'auto',
     censorbadwords: false,
-    disableemoteanimations: false,
-    disableflairanimations: false,
+    disableanimations: false,
   }),
 );
 

diff --git a/assets/views/embed.html b/assets/views/embed.html
@@ -148,15 +148,9 @@ <h4>Messages</h4>
               </select>
             </div>
             <div class="form-group checkbox">
-              <label title="Disable non-GIF emote animations">
-                <input name="disableemoteanimations" type="checkbox" /> Disable
-                non-GIF emote animations
-              </label>
-            </div>
-            <div class="form-group checkbox">
-              <label title="Disable non-GIF flair animations">
-                <input name="disableflairanimations" type="checkbox" /> Disable
-                non-GIF flair animations
+              <label title="Disable animations when possible">
+                <input name="disableanimations" type="checkbox" /> Disable
+                animations when possible
               </label>
             </div>