diff options
author | Sorin Davidoi <sorin.davidoi@gmail.com> | 2017-07-09 15:02:26 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-09 15:02:26 +0200 |
commit | fc4c74660b690038ae48264f9d5b0230df58acc4 (patch) | |
tree | 51ed1a92c15a1700da32b6914e446f1d4a12e24e /app/javascript/mastodon/features/ui/components/column_loading.js | |
parent | caf938562ef0d0fdb03bf57f15bbab8d76c5b4c0 (diff) |
Swipeable views (#4105)
* feat: Replace react-swipeable with react-swipeable-views * fix: iOS 9
Diffstat (limited to 'app/javascript/mastodon/features/ui/components/column_loading.js')
-rw-r--r-- | app/javascript/mastodon/features/ui/components/column_loading.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/ui/components/column_loading.js b/app/javascript/mastodon/features/ui/components/column_loading.js index 9bb9c14a1..7ecfaf77a 100644 --- a/app/javascript/mastodon/features/ui/components/column_loading.js +++ b/app/javascript/mastodon/features/ui/components/column_loading.js @@ -1,13 +1,19 @@ import React from 'react'; +import PropTypes from 'prop-types'; import Column from '../../../components/column'; import ColumnHeader from '../../../components/column_header'; -const ColumnLoading = () => ( +const ColumnLoading = ({ title = '', icon = ' ' }) => ( <Column> - <ColumnHeader icon=' ' title='' multiColumn={false} /> + <ColumnHeader icon={icon} title={title} multiColumn={false} /> <div className='scrollable' /> </Column> ); +ColumnLoading.propTypes = { + title: PropTypes.node, + icon: PropTypes.string, +}; + export default ColumnLoading; |