ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Update dependencies for Node.js (2018-12-31) 

Port compatibility changes from 8f5fdab5bf to glitch-soc
rebase/4.0.0rc2
Thibaut Girka 2019-01-02 16:07:33 +01:00
parent 1464620ddb
commit e77ceb1b29
6 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/ui/containers/columns_area_container.js
View File

@ -5,4 +5,4 @@ const mapStateToProps = state => ({
columns: state.getIn(['settings', 'columns']), columns: state.getIn(['settings', 'columns']),
}); });
export default connect(mapStateToProps, null, null, { withRef: true })(ColumnsArea); export default connect(mapStateToProps, null, null, { forwardRef: true })(ColumnsArea);

4
app/javascript/flavours/glitch/features/ui/containers/loading_bar_container.js
View File

@ -1,8 +1,8 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import LoadingBar from 'react-redux-loading-bar'; import LoadingBar from 'react-redux-loading-bar';
const mapStateToProps = (state) => ({ const mapStateToProps = (state, ownProps) => ({
loading: state.get('loadingBar'), loading: state.get('loadingBar')[ownProps.scope || 'default'],
}); });
export default connect(mapStateToProps)(LoadingBar.WrappedComponent); export default connect(mapStateToProps)(LoadingBar.WrappedComponent);

2
app/javascript/flavours/glitch/features/ui/index.js
View File

@ -303,7 +303,7 @@ export default class UI extends React.Component {
} }
setColumnsAreaRef = c => { setColumnsAreaRef = c => {
this.columnsAreaNode = c.getWrappedInstance().getWrappedInstance(); this.columnsAreaNode = c.getWrappedInstance();
} }
handleHotkeyNew = e => { handleHotkeyNew = e => {

2
app/javascript/flavours/glitch/store/configureStore.js
View File

@ -11,5 +11,5 @@ export default function configureStore() {
loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }), loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }),
errorsMiddleware(), errorsMiddleware(),
soundsMiddleware() soundsMiddleware()
), window.devToolsExtension ? window.devToolsExtension() : f => f)); ), window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f));
}; };

2
app/javascript/flavours/glitch/util/api.js
View File

@ -1,6 +1,6 @@
import axios from 'axios'; import axios from 'axios';
import ready from './ready'; import ready from './ready';
import LinkHeader from './link_header'; import LinkHeader from 'http-link-header';
export const getLinks = response => { export const getLinks = response => {
const value = response.headers.link; const value = response.headers.link;

33
app/javascript/flavours/glitch/util/link_header.js
View File

@ -1,33 +0,0 @@
import Link from 'http-link-header';
import querystring from 'querystring';
Link.parseAttrs = (link, parts) => {
let match = null;
let attr = '';
let value = '';
let attrs = '';
let uriAttrs = /<(.*)>;\s*(.*)/gi.exec(parts);
if(uriAttrs) {
attrs = uriAttrs[2];
link = Link.parseParams(link, uriAttrs[1]);
}
while(match = Link.attrPattern.exec(attrs)) { // eslint-disable-line no-cond-assign
attr = match[1].toLowerCase();
value = match[4] || match[3] || match[2];
if( /\*$/.test(attr)) {
Link.setAttr(link, attr, Link.parseExtendedValue(value));
} else if(/%/.test(value)) {
Link.setAttr(link, attr, querystring.decode(value));
} else {
Link.setAttr(link, attr, value);
}
}
return link;
};
export default Link;