logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 97b3d0cd567ff5b38343796a5e662087bd45d710
parent: fd7f0732fe26554c51218c4f67955e8050590d2c
Author: Nolan Lawson <nolan@nolanlawson.com>
Date:   Thu,  5 Oct 2017 18:46:15 -0700

Import only Spring/Motion from react-motion (#5236)


Diffstat:

Mapp/javascript/mastodon/components/dropdown_menu.js3++-
Mapp/javascript/mastodon/features/compose/components/privacy_dropdown.js3++-
Mapp/javascript/mastodon/features/compose/components/search.js3++-
Mapp/javascript/mastodon/features/compose/components/warning.js3++-
4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js @@ -3,7 +3,8 @@ import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import IconButton from './icon_button'; import Overlay from 'react-overlays/lib/Overlay'; -import { Motion, spring } from 'react-motion'; +import Motion from 'react-motion/lib/Motion'; +import spring from 'react-motion/lib/spring'; import detectPassiveEvents from 'detect-passive-events'; const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false; diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js @@ -3,7 +3,8 @@ import PropTypes from 'prop-types'; import { injectIntl, defineMessages } from 'react-intl'; import IconButton from '../../../components/icon_button'; import Overlay from 'react-overlays/lib/Overlay'; -import { Motion, spring } from 'react-motion'; +import Motion from 'react-motion/lib/Motion'; +import spring from 'react-motion/lib/spring'; import detectPassiveEvents from 'detect-passive-events'; import classNames from 'classnames'; diff --git a/app/javascript/mastodon/features/compose/components/search.js b/app/javascript/mastodon/features/compose/components/search.js @@ -2,7 +2,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import Overlay from 'react-overlays/lib/Overlay'; -import { Motion, spring } from 'react-motion'; +import Motion from 'react-motion/lib/Motion'; +import spring from 'react-motion/lib/spring'; const messages = defineMessages({ placeholder: { id: 'search.placeholder', defaultMessage: 'Search' }, diff --git a/app/javascript/mastodon/features/compose/components/warning.js b/app/javascript/mastodon/features/compose/components/warning.js @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Motion, spring } from 'react-motion'; +import Motion from 'react-motion/lib/Motion'; +import spring from 'react-motion/lib/spring'; export default class Warning extends React.PureComponent {