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

Merge branch 'main' of https://github.com/Apple-Music-Electron/Cider

Browse source
This commit is contained in:
booploops 2021-12-07 13:36:38 -08:00
commit a9d91cc539
8 changed files with 133 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/cider-ui-tests/views/main.ejs
View file

@ -100,7 +100,7 @@
</div>
<div class="app-chrome-item generic">
<button class="playback-button--small lyrics"
@click="drawertest = !drawertest; lyricon =!lyricon; if(drawertest == true){loadLyrics();}"></button>
@click=" lyricon =!lyricon; if( document.getElementById(`apple-music-video-container`).style.display != `block`){drawertest = !drawertest}; "></button>
</div>
<div class="app-chrome-item full-height">
<div class="window-controls">
@ -166,7 +166,8 @@
</div>
</transition>
<div class="app-sidebar-footer">
<input type="range" class="display--small">
<input type="range" class="display--small" step="0.01" min="0" max="1" v-model="mk.volume"
v-if="typeof mk.volume != 'undefined'">
<button class="app-sidebar-button" style="width:100%"
@click="chrome.menuOpened = !chrome.menuOpened">
<template v-if="chrome.userinfo.attributes">
@ -340,6 +341,7 @@
fill-rule="nonzero" />
</svg>
</div>
<div id="captions">{{(app.lyricon) ? ((app.lyrics.length > 0 ) ? app.lyrics[app.currentLyricsLine].line.replace('lrcInstrumental','') : "") : ''}}</div>
<div id="player-pip" @click="document.querySelector('video').requestPictureInPicture()"
title="Picture-in-Picture">
<%- include("svg/fullscreen.svg") %>
@ -425,6 +427,8 @@
<%- include('components/mediaitem-square-large') %>
<!-- MediaItem Square SP -->
<%- include('components/mediaitem-square-sp') %>
<!-- Animated Artwork View -->
<%- include('components/animatedartwork-view') %>
<!-- Lyrics View -->
<script type="text/x-template" id="lyrics-view">
@ -455,9 +459,8 @@
</template>
</div>
</script>
<script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>
<script src="https://js-cdn.music.apple.com/musickit/v2/amp/musickit.js"></script>
<script src="index.js?v=1"></script>
</body>
</html>