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

Removing UI_ appendage

Browse Source
This commit is contained in:
James Barnsley
2016-11-09 15:51:38 +13:00
parent b0109abd44
commit 7afdbc1fd9
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mopidy_iris/static/app.js
View File

@ -4547,7 +4547,7 @@
var data = arguments[2];
return {
type: 'UI_SHOW_CONTEXT_MENU',
type: 'SHOW_CONTEXT_MENU',
position_x: e.clientX,
position_y: e.clientY,
context: context,
@ -4557,7 +4557,7 @@
function hideContextMenu() {
return {
type: 'UI_HIDE_CONTEXT_MENU'
type: 'HIDE_CONTEXT_MENU'
};
}
@ -4579,7 +4579,7 @@
function lazyLoading(start) {
return {
type: 'UI_LAZY_LOADING',
type: 'LAZY_LOADING',
start: start
};
}
@ -20970,7 +20970,13 @@
switch (action.type) {
case 'UI_SHOW_CONTEXT_MENU':
case 'LAZY_LOADING':
return Object.assign({}, ui, { lazy_loading: action.start });
/**
* Context menu
**/
case 'SHOW_CONTEXT_MENU':
return Object.assign({}, ui, {
context_menu: {
show: true,
@ -20981,11 +20987,13 @@
}
});
case 'UI_HIDE_CONTEXT_MENU':
case 'HIDE_CONTEXT_MENU':
return Object.assign({}, ui, { context_menu: { show: false } });
case 'UI_LAZY_LOADING':
return Object.assign({}, ui, { lazy_loading: action.start });
/**
* General assets
* Playlists/albums/etc
**/
case 'SPOTIFY_ALBUM_LOADED':
case 'MOPIDY_ALBUM_LOADED':

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

6
src/js/services/ui/actions.js
View File

@ -2,7 +2,7 @@
export function showContextMenu( e, context = false, data ){
return {
type: 'UI_SHOW_CONTEXT_MENU',
type: 'SHOW_CONTEXT_MENU',
position_x: e.clientX,
position_y: e.clientY,
context: context,
@ -12,7 +12,7 @@ export function showContextMenu( e, context = false, data ){
export function hideContextMenu(){
return {
type: 'UI_HIDE_CONTEXT_MENU'
type: 'HIDE_CONTEXT_MENU'
}
}
@ -34,7 +34,7 @@ export function searchStarted(){
export function lazyLoading( start ){
return {
type: 'UI_LAZY_LOADING',
type: 'LAZY_LOADING',
start: start
}
}

19
src/js/services/ui/reducer.js
View File

@ -2,7 +2,13 @@
export default function reducer(ui = {}, action){
switch (action.type) {
case 'UI_SHOW_CONTEXT_MENU':
case 'LAZY_LOADING':
return Object.assign({}, ui, { lazy_loading: action.start });
/**
* Context menu
**/
case 'SHOW_CONTEXT_MENU':
return Object.assign({}, ui, {
context_menu: {
show: true,
@ -13,11 +19,14 @@ export default function reducer(ui = {}, action){
}
});
case 'UI_HIDE_CONTEXT_MENU':
case 'HIDE_CONTEXT_MENU':
return Object.assign({}, ui, { context_menu: { show: false } });
case 'UI_LAZY_LOADING':
return Object.assign({}, ui, { lazy_loading: action.start });
/**
* General assets
* Playlists/albums/etc
**/
case 'SPOTIFY_ALBUM_LOADED':
case 'MOPIDY_ALBUM_LOADED':
@ -87,7 +96,7 @@ export default function reducer(ui = {}, action){
return Object.assign({}, ui, { search_results: action.data })
case 'MOPIDY_SEARCH':
// collate all our different sources into one array
var tracks = []
for( var i = 0; i < action.data.length; i++ ){