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

Merge pull request #143 from SoNothingMC/main

Browse source 
Change hyphens into em dashes for separators
This commit is contained in:
cryptofyre 2022-01-16 10:53:41 -06:00 • committed by GitHub
commit c47416770a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/lastfm.js
View file

@ -95,7 +95,7 @@ const lfm = {
this.authenticate(); this.authenticate();
} }
} else { } else {
return console.log('[LastFM] Did not add ', attributes.name , '-' , lfm.filterArtistName(attributes.artistName), 'because now playing a other song.'); return console.log('[LastFM] Did not add ', attributes.name , '—' , lfm.filterArtistName(attributes.artistName), 'because now playing a other song.');
} }
}, },

4
src/renderer/index_old.html
View file

@ -64,7 +64,7 @@
{{ mk.nowPlayingItem["attributes"]["name"] }} {{ mk.nowPlayingItem["attributes"]["name"] }}
</div> </div>
<div class="song-artist"> <div class="song-artist">
{{ mk.nowPlayingItem["attributes"]["artistName"] }} - {{ {{ mk.nowPlayingItem["attributes"]["artistName"] }} — {{
mk.nowPlayingItem["attributes"]["albumName"] }} mk.nowPlayingItem["attributes"]["albumName"] }}
</div> </div>
<div class="song-progress"> <div class="song-progress">
@ -560,7 +560,7 @@
<template v-if="item.attributes.artistName"> <template v-if="item.attributes.artistName">
{{ item.attributes.artistName }} {{ item.attributes.artistName }}
<template v-if="item.attributes.albumName"> <template v-if="item.attributes.albumName">
- {{ item.attributes.albumName }} — {{ item.attributes.albumName }}
</template> </template>
</template> </template>
</div> </div>

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

@ -33,7 +33,7 @@
</div> </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.mk.nowPlayingItem["attributes"]["albumName"]) ? (" - " + {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (" — " +
app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }} app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
</div> </div>
</div> </div>

2
src/renderer/views/components/mediaitem-list-item.ejs
View file

@ -39,7 +39,7 @@
@click="app.searchAndNavigate(item,'artist')"> @click="app.searchAndNavigate(item,'artist')">
{{ item.attributes.artistName }} {{ item.attributes.artistName }}
</div> </div>
<template v-if="item.attributes.albumName">&nbsp;-&nbsp;</template> <template v-if="item.attributes.albumName">&nbsp;—&nbsp;</template>
<template v-if="item.attributes.albumName"> <template v-if="item.attributes.albumName">
<div class="artist item-navigate text-overflow-elipsis" <div class="artist item-navigate text-overflow-elipsis"
@click="app.searchAndNavigate(item,'album')"> @click="app.searchAndNavigate(item,'album')">

2
src/renderer/views/components/queue-item.ejs
View file

@ -19,7 +19,7 @@
<div class="artist item-navigate text-overflow-elipsis" @click="app.searchAndNavigate(item,'artist')"> <div class="artist item-navigate text-overflow-elipsis" @click="app.searchAndNavigate(item,'artist')">
{{ item.attributes.artistName }} {{ item.attributes.artistName }}
</div> </div>
<template v-if="item.attributes.albumName">&nbsp;-&nbsp;</template> <template v-if="item.attributes.albumName">&nbsp;—&nbsp;</template>
<template v-if="item.attributes.albumName"> <template v-if="item.attributes.albumName">
<div class="artist item-navigate text-overflow-elipsis" @click="app.searchAndNavigate(item,'album')"> <div class="artist item-navigate text-overflow-elipsis" @click="app.searchAndNavigate(item,'album')">
{{ item.attributes.albumName }} {{ item.attributes.albumName }}

2
src/renderer/views/components/queue.ejs
View file

@ -25,7 +25,7 @@
</div> </div>
<div class="col queue-info"> <div class="col queue-info">
<div class="queue-title text-overflow-elipsis">{{ queueItem.item.attributes.name }}</div> <div class="queue-title text-overflow-elipsis">{{ queueItem.item.attributes.name }}</div>
<div class="queue-subtitle text-overflow-elipsis">{{ queueItem.item.attributes.albumName }} - {{ queueItem.item.attributes.artistName }}</div> <div class="queue-subtitle text-overflow-elipsis">{{ queueItem.item.attributes.albumName }} — {{ queueItem.item.attributes.artistName }}</div>
</div> </div>
</div> </div>
</div> </div>

2
src/renderer/views/main.ejs
View file

@ -93,7 +93,7 @@
</div> </div>
<div class="song-artist item-navigate" style="display: inline-block;" <div class="song-artist item-navigate" style="display: inline-block;"
@click="getNowPlayingItemDetailed('album')"> @click="getNowPlayingItemDetailed('album')">
<div class="separator" style="display: inline-block;">{{"-"}}</div> <div class="separator" style="display: inline-block;">{{"—"}}</div>
{{(mk.nowPlayingItem["attributes"]["albumName"]) ? {{(mk.nowPlayingItem["attributes"]["albumName"]) ?
(mk.nowPlayingItem["attributes"]["albumName"]) : "" }} (mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
</div> </div>