Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox

2017-04-13 16:14:11 +02:00 · 2017-04-13 16:14:11 +02:00 · e70b84b1dc
commit e70b84b1dc
parent d7a4e8739a 00cc3066a2
10 changed files with 95 additions and 9 deletions
--- a/app/assets/javascripts/components/containers/status_container.jsx
+++ b/app/assets/javascripts/components/containers/status_container.jsx
@ -75,6 +75,10 @@ const mapDispatchToProps = (dispatch) => ({
    dispatch(openModal('MEDIA', { media, index }));
  },

+  onOpenVideo (media) {
+    dispatch(openModal('VIDEO', { media }));
+  },
+
  onBlock (account) {
    dispatch(blockAccount(account.get('id')));
  },