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

Default search settings; Disabled follow button, but visible

Browse Source
This commit is contained in:
James Barnsley
2017-09-09 21:06:15 +12:00
parent d1c761a879
commit e4f687d24f
7 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/services/core/middleware.js
View File

@ -108,8 +108,8 @@ const CoreMiddleware = (function(){
next(action)
var state = store.getState()
if (state.ui.search_settings){
var uri_schemes = state.ui.search_settings.uri_schemes
if (state.ui.search_uri_schemes){
var uri_schemes = state.ui.search_uri_schemes
} else {
var uri_schemes = state.mopidy.uri_schemes
}

7
src/js/services/mopidy/middleware.js
View File

@ -241,6 +241,11 @@ const MopidyMiddleware = (function(){
})
}
// If we haven't customised our search schemes, add all to search
if (store.getState().ui.search_uri_schemes === undefined){
store.dispatch(uiActions.set({search_uri_schemes: uri_schemes}));
}
store.dispatch({ type: 'MOPIDY_URISCHEMES_FILTERED', data: uri_schemes });
break
@ -507,7 +512,7 @@ const MopidyMiddleware = (function(){
store.dispatch({type: 'MOPIDY_CLEAR_SEARCH_RESULTS'})
var uri_schemes_to_ignore = ['spotify:']
var uri_schemes = Object.assign([], store.getState().ui.search_settings.uri_schemes)
var uri_schemes = Object.assign([], store.getState().ui.search_uri_schemes)
for (var i = 0; i < uri_schemes.length; i++){
if (uri_schemes_to_ignore.includes(uri_schemes[i])){
uri_schemes.splice(i,1)