secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Upgrading everything, especially router

Browse Source
This commit is contained in:
James Barnsley
2019-01-09 16:56:35 +13:00
parent 24d5d7b94e
commit 56587aa6fb
31 changed files with 18516 additions and 17159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/components/ContextMenu.js
View File

@ -1,6 +1,6 @@
import React, { PropTypes } from 'react';
import { hashHistory } from 'react-router';
import Link from './Link';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
@ -273,7 +273,7 @@ class ContextMenu extends React.Component{
goToRecommendations(e){
this.props.uiActions.hideContextMenu();
var uris_string = helpers.arrayOf('uri',this.props.menu.items).join(',');
hashHistory.push(global.baseURL +'discover/recommendations/'+ uris_string );
this.props.history.push(global.baseURL +'discover/recommendations/'+ uris_string );
}
goToArtist(e){
@ -283,7 +283,7 @@ class ContextMenu extends React.Component{
this.props.uiActions.hideContextMenu();
// note: we can only go to one artist (even if this item has multiple artists, just go to the first one)
hashHistory.push(global.baseURL +'artist/'+ this.props.menu.items[0].artists_uris[0]);
this.props.history.push(global.baseURL +'artist/'+ this.props.menu.items[0].artists_uris[0]);
}
}
@ -292,7 +292,7 @@ class ContextMenu extends React.Component{
return null;
} else {
this.props.uiActions.hideContextMenu();
hashHistory.push(global.baseURL +'user/'+ this.props.menu.items[0].user_uri);
this.props.history.push(global.baseURL +'user/'+ this.props.menu.items[0].user_uri);
}
}
@ -301,7 +301,7 @@ class ContextMenu extends React.Component{
return null;
} else {
this.props.uiActions.hideContextMenu();
hashHistory.push(global.baseURL +'track/'+ encodeURIComponent(this.props.menu.items[0].uri));
this.props.history.push(global.baseURL +'track/'+ encodeURIComponent(this.props.menu.items[0].uri));
}
}