From ef5fe40804661abf85d34a93696d9b988895931d Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Tue, 26 Jul 2022 21:18:07 -0500
Subject: [PATCH] obama episode 2. (#1317)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update ru_RU.json

keeping russian lang actual

* ok

* Add gradient to lyric-footer

* *Commit en español Ñ (#1304)

* i hate my life (#1307)

* world is now a better place

* meltdown avoided

* meltdown avoided

* stylize new listen now childs

* full scale artwork, finally

* dynamic width for search categories

* hd all album work

* Update afterPack.js

* force hq quality

* oops

* attempt to fix

* misc cleanup

* why what

* what was i thinking

* fix duplicated text in listen now childs

* Paginate/infinite scroll for  albums, playlists (#1234)

* Infinite scroll, pagination to album, playlists

* move pagination below tracks

* Make page size configurable

* remove renderer

* Mitigate songs / album slow app issue.

* add ratings, library change to web remote (#1285)

* Add compact artist header option (#1308)

* Support compact artist header (optional)

* Add required term

* improve pagination styling

* Disable Fullscreen view when artist/album name is clicked. (#1315)

* Disable Fullscreen view when artist/album name is clicked.

idk why this change didn't exist

* Seperate dash from album name

* Replace `$root.showSearch()` with `app.appRoute('search')`

`$root.showSearch()` prevents going back to previous page from sidebar.

* Fix Anim (#1316)

Co-authored-by: h0ckerman <35598335+h0ckerman@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: Monochromish <chillygamer7@gmail.com>
Co-authored-by: Gabriel Davila <56521591+mefsaal@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: Maikiwi <stella@mai.kiwi>
Co-authored-by: yazninja <yazlesean@gmail.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Co-authored-by: Pedro Galhardo <pgalhardo@icloud.com>
Co-authored-by: Monochromish <79590499+Monochromish@users.noreply.github.com>
---
 src/renderer/views/components/animatedartwork-view.ejs |  2 +-
 src/renderer/views/components/fullscreen.ejs           | 10 ++++++----
 src/renderer/views/components/sidebar.ejs              |  4 ++--
 src/renderer/views/main.ejs                            |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/renderer/views/components/animatedartwork-view.ejs b/src/renderer/views/components/animatedartwork-view.ejs
index 8236252f..6ffc923f 100644
--- a/src/renderer/views/components/animatedartwork-view.ejs
+++ b/src/renderer/views/components/animatedartwork-view.ejs
@@ -43,7 +43,7 @@
                         this.hls.detachMedia();
                     } else {
 
-                        this.hls = new Hls(config);
+                        this.hls = new CiderHls(config);
                     }
                     // bind them together
                     if (this.$refs.video) {
diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index 151090f6..aaf07e39 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -51,13 +51,15 @@
                                 <div
                                         style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap; margin-top: 0.25vh; overflow: hidden;">
                                     <div class="item-navigate song-artist" style="display: inline-block;"
-                                         @click="app.getNowPlayingItemDetailed(`artist`)">
+                                         @click="app.getNowPlayingItemDetailed(`artist`) && app.fullscreen(false)">
                                         {{ app.mk.nowPlayingItem["attributes"]["artistName"] }}
                                     </div>
+                                    <div class="song-artist" style="display: inline-block;">
+                                        {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? " — " : "" }}
+                                    </div>
                                     <div class="song-artist item-navigate" style="display: inline-block;"
-                                         @click="app.getNowPlayingItemDetailed('album')">
-                                        {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (" — " +
-                                        app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
+                                         @click="app.getNowPlayingItemDetailed('album') && app.fullscreen(false)">
+                                        {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
                                     </div>
                                 </div>
 
diff --git a/src/renderer/views/components/sidebar.ejs b/src/renderer/views/components/sidebar.ejs
index 91f13510..01ebff4a 100644
--- a/src/renderer/views/components/sidebar.ejs
+++ b/src/renderer/views/components/sidebar.ejs
@@ -7,11 +7,11 @@
                     <input
                             type="search"
                             spellcheck="false"
-                            @click="$root.showSearch()"
+                            @click="app.appRoute('search');"
                             @focus="$root.search.showHints = true"
                             @blur="$root.setTimeout(()=>{$root.search.showHints = false}, 300)"
                             v-on:keyup.enter="$root.searchQuery();$root.search.showHints = false"
-                            @change="$root.showSearch();"
+                            @change="app.appRoute('search');"
                             @input="$root.getSearchHints()"
                             :placeholder="$root.getLz('term.search') + '...'"
                             v-model="$root.search.term"
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 5ae9e88f..e4ace12d 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -23,7 +23,7 @@
         <script src="./lib/smoothscroll.js"></script>
         <link rel="manifest" href="./manifest.json?v=2">
         <script src="https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js"></script>
-        <!-- <script src="hlscider.js"></script> -->
+        <script src="hlscider.js"></script>
         <script src="./lib/jquery-3.2.1.slim.min.js"></script>
         <script src="./lib/popper.min.js"></script>
         <script src="./lib/bootstrap.min.js"></script>