Merge branch 'develop'
This commit is contained in:
@ -63,6 +63,13 @@ class App extends React.Component{
|
|||||||
|
|
||||||
// Check our slim_mode
|
// Check our slim_mode
|
||||||
this.handleWindowResize(null);
|
this.handleWindowResize(null);
|
||||||
|
|
||||||
|
// Check for url-parsed configuration values
|
||||||
|
var url_vars = this.props.location.query;
|
||||||
|
if (url_vars !== undefined){
|
||||||
|
this.props.mopidyActions.setConfig(url_vars);
|
||||||
|
hashHistory.push(global.baseURL);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
shouldTriggerShortcut(e){
|
shouldTriggerShortcut(e){
|
||||||
|
|||||||
Reference in New Issue
Block a user