Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Refactor initial state: reduce_motion and auto_play_gif (#5501)

Browse source
This commit is contained in:
Nolan Lawson 2017-10-27 08:04:44 -07:00 • committed by unarist
parent e4080772b5
commit 3de22a82bf
13 changed files with 27 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/mastodon/features/ui/util/optional_motion.js
View file

@ -4,11 +4,10 @@
import React from 'react';
import Motion from 'react-motion/lib/Motion';
import PropTypes from 'prop-types';
import { reduceMotion } from '../../../initial_state';
const stylesToKeep = ['opacity', 'backgroundOpacity'];
let reduceMotion;
const extractValue = (value) => {
// This is either an object with a "val" property or it's a number
return (typeof value === 'object' && value && 'val' in value) ? value.val : value;
@ -26,12 +25,6 @@ class OptionalMotion extends React.Component {
const { style, defaultStyle, children } = this.props;
if (typeof reduceMotion !== 'boolean') {
// This never changes without a page reload, so we can just grab it
// once from the body classes as opposed to using Redux's connect(),
// which would unnecessarily update every state change
reduceMotion = document.body.classList.contains('reduce-motion');
}
if (reduceMotion) {
Object.keys(style).forEach(key => {
if (stylesToKeep.includes(key)) {