okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
Monochromish 2022-07-27 07:55:43 +10:00 • committed by GitHub
parent 72b756cc27
commit 05c79cb991
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/renderer/views/components/fullscreen.ejs
View file

@ -51,13 +51,15 @@
<div <div
style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap; margin-top: 0.25vh; overflow: hidden;"> 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;" <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"] }} {{ app.mk.nowPlayingItem["attributes"]["artistName"] }}
</div> </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;" <div class="song-artist item-navigate" style="display: inline-block;"
@click="app.getNowPlayingItemDetailed('album')"> @click="app.getNowPlayingItemDetailed('album') && app.fullscreen(false)">
{{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (" — " + {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
</div> </div>
</div> </div>

4
src/renderer/views/components/sidebar.ejs
View file

@ -7,11 +7,11 @@
<input <input
type="search" type="search"
spellcheck="false" spellcheck="false"
@click="$root.showSearch()" @click="app.appRoute('search');"
@focus="$root.search.showHints = true" @focus="$root.search.showHints = true"
@blur="$root.setTimeout(()=>{$root.search.showHints = false}, 300)" @blur="$root.setTimeout(()=>{$root.search.showHints = false}, 300)"
v-on:keyup.enter="$root.searchQuery();$root.search.showHints = false" v-on:keyup.enter="$root.searchQuery();$root.search.showHints = false"
@change="$root.showSearch();" @change="app.appRoute('search');"
@input="$root.getSearchHints()" @input="$root.getSearchHints()"
:placeholder="$root.getLz('term.search') + '...'" :placeholder="$root.getLz('term.search') + '...'"
v-model="$root.search.term" v-model="$root.search.term"