about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-01-02 16:07:33 +0100
committerThibaut Girka <thib@sitedethib.com>2019-01-02 16:07:33 +0100
commite77ceb1b29547ed89b4110b3cc3edc9ac325b620 (patch)
treef5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /app/javascript/flavours/glitch/features
parent1464620ddbd5bc4c49a7f68c46192d0919b24528 (diff)
[Glitch] Update dependencies for Node.js (2018-12-31)
Port compatibility changes from 8f5fdab5bf681ff45a07965940bc45c9061a2f89 to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/features')
-rw-r--r--app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js2
-rw-r--r--app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js4
-rw-r--r--app/javascript/flavours/glitch/features/ui/index.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js b/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js
index 95f95618b..4e26f3017 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js
@@ -5,4 +5,4 @@ const mapStateToProps = state => ({
   columns: state.getIn(['settings', 'columns']),
 });
 
-export default connect(mapStateToProps, null, null, { withRef: true })(ColumnsArea);
+export default connect(mapStateToProps, null, null, { forwardRef: true })(ColumnsArea);
diff --git a/app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js b/app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js
index 4bb90fb68..63e994f92 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js
@@ -1,8 +1,8 @@
 import { connect }    from 'react-redux';
 import LoadingBar from 'react-redux-loading-bar';
 
-const mapStateToProps = (state) => ({
-  loading: state.get('loadingBar'),
+const mapStateToProps = (state, ownProps) => ({
+  loading: state.get('loadingBar')[ownProps.scope || 'default'],
 });
 
 export default connect(mapStateToProps)(LoadingBar.WrappedComponent);
diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js
index 5d82f0dd7..f043f767e 100644
--- a/app/javascript/flavours/glitch/features/ui/index.js
+++ b/app/javascript/flavours/glitch/features/ui/index.js
@@ -303,7 +303,7 @@ export default class UI extends React.Component {
   }
 
   setColumnsAreaRef = c => {
-    this.columnsAreaNode = c.getWrappedInstance().getWrappedInstance();
+    this.columnsAreaNode = c.getWrappedInstance();
   }
 
   handleHotkeyNew = e => {