From 1e631ab0ac7a71c959509fdffd5778c40d5a8efb Mon Sep 17 00:00:00 2001 From: Craig Drummond Date: Sun, 10 Mar 2019 13:56:10 +0000 Subject: [PATCH] Fix clicking on server-supplied categories. --- ChangeLog | 4 ++++ MaterialSkin/HTML/material/html/js/browse-page.js | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fcb4cd71..a70e72a5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +0.3.5 +----- +1. Fix clicking on server-supplied categories. + 0.3.4 ----- 1. Fix sub-toolbar actions when showing album track list navigated into via a diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js index 026bb19f3..4f7c335a4 100644 --- a/MaterialSkin/HTML/material/html/js/browse-page.js +++ b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -485,11 +485,13 @@ var lmsBrowse = Vue.component("lms-browse", { { title: i18n("Random Mix"), svg: "dice-multiple", id: TOP_RANDOM_MIX_ID, + type: "app", disabled: !this.randomMix }, { title: i18n("Dynamic Playlists"), command: ["dynamicplaylist", "browsejive"], params: [], svg: "dice-list", + type: "group", id: TOP_DYNAMIC_PLAYLISTS_ID, disabled: !this.dynamicPlaylists }, { title: i18n("Years"), @@ -553,7 +555,6 @@ var lmsBrowse = Vue.component("lms-browse", { } this.fetchingItems = true; - //console.log("FETCH command:" + command.command + " params:" + command.params); var lmsBatchSize = item.cancache ? LMS_CACHE_BATCH_SIZE : LMS_BATCH_SIZE; var start = item.range ? item.range.start : 0; var count = item.range ? item.range.count < lmsBatchSize ? item.range.count : lmsBatchSize : batchSize ? batchSize : lmsBatchSize; @@ -1334,7 +1335,6 @@ var lmsBrowse = Vue.component("lms-browse", { }); cmd=c; } - //console.log("COMMAND", cmd.command, cmd.params); return cmd; }, buildFullCommand(item, act, index) { @@ -1500,6 +1500,7 @@ var lmsBrowse = Vue.component("lms-browse", { svg: "dice-multiple", id: TOP_RANDOM_MIX_ID, group: GROUP_MY_MUSIC, + type: "app", weight: c.weight ? parseFloat(c.weight) : 100 }); } else if (!c.id.startsWith("myMusicSearch") && !c.id.startsWith("opmlselect")) { var command = this.buildCommand(c, "go", false); @@ -1509,6 +1510,7 @@ var lmsBrowse = Vue.component("lms-browse", { weight: c.weight ? parseFloat(c.weight) : 100, group: GROUP_MY_MUSIC, id: TOP_ID_PREFIX+c.id, + type: "group" }; if (c.id.startsWith("myMusicArtists")) { @@ -1535,7 +1537,7 @@ var lmsBrowse = Vue.component("lms-browse", { item.icon = "computer"; } else if (c.id == "myMusicRandomAlbums") { item.svg = "dice-album"; - item.id=TOP_RANDOM_ALBUMS_ID; + item.id = TOP_RANDOM_ALBUMS_ID; } else if (c.id.startsWith("myMusicTopTracks")) { item.icon = "arrow_upward"; } else if (c.id.startsWith("myMusicFlopTracks")) {