Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

2 files changed, 67 insertions, 1 deletions

diff --git a/app/assets/javascripts/components/features/ui/components/boost_modal.jsx b/app/assets/javascripts/components/features/ui/components/boost_modal.jsx
new file mode 100644
index 000000000..8b9154183
--- /dev/null
+++ b/app/assets/javascripts/components/features/ui/components/boost_modal.jsx
@@ -0,0 +1,64 @@
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { defineMessages, injectIntl } from 'react-intl';
+import IconButton from '../../../components/icon_button';
+import Button from '../../../components/button';
+import DetailedStatus from '../../status/components/detailed_status';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+  reblog: { id: 'status.reblog', defaultMessage: 'Boost' }
+});
+
+const closeStyle = {
+  position: 'absolute',
+  top: '4px',
+  right: '4px'
+};
+
+const buttonContainerStyle = {
+  textAlign: 'right',
+  padding: '10px'
+};
+
+const BoostModal = React.createClass({
+
+  propTypes: {
+    status: ImmutablePropTypes.map.isRequired,
+    onReblog: React.PropTypes.func.isRequired,
+    onClose: React.PropTypes.func.isRequired,
+    intl: React.PropTypes.object.isRequired
+  },
+
+  mixins: [PureRenderMixin],
+
+  handleReblog() {
+    this.props.onReblog(this.props.status);
+    this.props.onClose();
+  },
+
+  handleOpenMedia() {
+    // do nothing"
+  },
+
+  render () {
+    const { status, intl, onClose } = this.props;
+
+    const reblogButton = <span><i className='fa fa-retweet' /> {intl.formatMessage(messages.reblog)}</span>;
+
+    return (
+      <div className='modal-root__modal boost-modal'>
+        <IconButton title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} style={closeStyle} />
+        <div>
+          <DetailedStatus status={status} onOpenMedia={this.handleOpenMedia} />
+        </div>
+        <div style={buttonContainerStyle}>
+          <Button text={reblogButton} onClick={this.handleReblog} />
+        </div>
+      </div>
+    );
+  }
+
+});
+
+export default injectIntl(BoostModal);
diff --git a/app/assets/javascripts/components/features/ui/components/modal_root.jsx b/app/assets/javascripts/components/features/ui/components/modal_root.jsx
index d2ae5e145..e7ac02dde 100644
--- a/app/assets/javascripts/components/features/ui/components/modal_root.jsx
+++ b/app/assets/javascripts/components/features/ui/components/modal_root.jsx
@@ -1,9 +1,11 @@
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 import MediaModal from './media_modal';
+import BoostModal from './boost_modal';
 import { TransitionMotion, spring } from 'react-motion';
 
 const MODAL_COMPONENTS = {
-  'MEDIA': MediaModal
+  'MEDIA': MediaModal,
+  'BOOST': BoostModal
 };
 
 const ModalRoot = React.createClass({