Fix click on artist/album link in exanded now-playing, then re-show that

when navigate back in browse.
CDrummond · May 2, 2021 · 5383e96 · 5383e96
1 parent 6a78508
commit 5383e96
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/MaterialSkin/HTML/material/html/js/browse-functions.js b/MaterialSkin/HTML/material/html/js/browse-functions.js
@@ -1087,8 +1087,19 @@ function browseGoBack(view, refresh) {
     }
     if (view.prevPage) {
         var nextPage = ""+view.prevPage;
-        if (NP_INFO==nextPage) {
-            view.$nextTick(function () { view.$nextTick(function () { if (!view.$store.state.desktopLayout) { view.$store.commit('setPage', 'now-playing'); } bus.$emit('info');}); });
+        if (NP_INFO==nextPage || NP_EXPANDED==nextPage) {
+            view.$nextTick(function () {
+                view.$nextTick(function () {
+                    if (!view.$store.state.desktopLayout) {
+                        view.$store.commit('setPage', 'now-playing');
+                    }
+                    if (NP_INFO==nextPage) {
+                        bus.$emit('info');
+                    } else {
+                        bus.$emit('expandNowPlaying', true);
+                    }
+                });
+            });
         } else if (!view.$store.state.desktopLayout) {
             view.$nextTick(function () { view.$nextTick(function () { view.$store.commit('setPage', nextPage); }); });
         }

diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js
@@ -1541,7 +1541,11 @@ var lmsBrowse = Vue.component("lms-browse", {
 
         bus.$on('browse', function(cmd, params, title, page) {
             this.clearSelection();
-            if (!this.$store.state.desktopLayout) {
+            if (this.$store.state.desktopLayout) {
+                if ('now-playing'==page && this.nowPlayingExpanded) {
+                    page = NP_EXPANDED;
+                }
+            } else {
                 this.$store.commit('setPage', 'browse');
             }
             this.goHome();

diff --git a/MaterialSkin/HTML/material/html/js/constants.js b/MaterialSkin/HTML/material/html/js/constants.js
@@ -105,6 +105,7 @@ const SECTION_NEWMUSIC = 6; // Not a real 'section' but used to indicate when to
 const SIMPLE_LIB_VIEWS = "SimpleLibraryViews ";
 const GRID_SINGLE_LINE_DIFF = 20;
 const NP_INFO = 'now-playing-info';
+const NP_EXPANDED = 'now-playing-expanded';
 
 const ARTIST_TYPES = ["albumartist", "trackartist", "artist", "band", "composer", "conductor"];
 var MULTI_SPLIT_REGEX = ";"