Merge branch 'glitch' into production

3 files changed, 10 insertions, 6 deletions

diff --git a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
index 2da0770d3..814f9a97a 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { defineMessages } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ComposeForm from '../components/compose_form';
 import {
   changeCompose,
@@ -133,4 +133,4 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm);
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ComposeForm));
diff --git a/app/javascript/flavours/glitch/features/video/index.js b/app/javascript/flavours/glitch/features/video/index.js
index 8291ff3c8..2e0d59d47 100644
--- a/app/javascript/flavours/glitch/features/video/index.js
+++ b/app/javascript/flavours/glitch/features/video/index.js
@@ -166,6 +166,10 @@ export default class Video extends React.PureComponent {
 
   setCanvasRef = c => {
     this.canvas = c;
+
+    if (c && this.props.blurhash) {
+      this._decode();
+    }
   }
 
   handleMouseDownRoot = e => {
@@ -310,6 +314,8 @@ export default class Video extends React.PureComponent {
   }
 
   _decode () {
+    if (!this.canvas) return;
+
     const hash   = this.props.blurhash;
     const pixels = decode(hash, 32, 32);
 
diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss
index f12f8b7fa..63211392e 100644
--- a/app/javascript/flavours/glitch/styles/components/index.scss
+++ b/app/javascript/flavours/glitch/styles/components/index.scss
@@ -565,8 +565,8 @@
   font-size: 14px;
   font-weight: 500;
   border-bottom: 2px solid lighten($ui-base-color, 8%);
-  transition: all 200ms linear;
-  transition-property: background;
+  transition: all 50ms linear;
+  transition-property: border-bottom, background, color;
 
   .fa {
     font-weight: 400;
@@ -583,8 +583,6 @@
   &:active {
     @include multi-columns('screen and (min-width: 631px)') {
       background: lighten($ui-base-color, 14%);
-      transition: all 100ms linear;
-      transition-property: background;
     }
   }