Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
Desktop Client
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SpinShare
Desktop Client
Commits
d4385397
Commit
d4385397
authored
Mar 31, 2020
by
Andreas Heimann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed a desync of the song detail preview
parent
1242a555
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
18 deletions
+27
-18
src/app.htm
src/app.htm
+1
-1
src/assets/js/init.js
src/assets/js/init.js
+3
-1
src/assets/js/navigation.js
src/assets/js/navigation.js
+2
-6
src/assets/js/section.songdetail.js
src/assets/js/section.songdetail.js
+21
-10
No files found.
src/app.htm
View file @
d4385397
...
...
@@ -209,10 +209,10 @@
<!-- Scripts -->
<script
src=
"./assets/js/init.js"
></script>
<script
src=
"./assets/js/system.js"
></script>
<script
src=
"./assets/js/navigation.js"
></script>
<script
src=
"./assets/js/section.startup.js"
></script>
<script
src=
"./assets/js/section.songdetail.js"
></script>
<script
src=
"./assets/js/download.js"
></script>
<script
src=
"./assets/js/navigation.js"
></script>
<!-- <script src="./assets/js/app.js"></script> -->
</body>
</html>
\ No newline at end of file
src/assets/js/init.js
View file @
d4385397
...
...
@@ -6,4 +6,6 @@ const fs = require('fs');
const
rimraf
=
require
(
'
rimraf
'
);
const
ncp
=
require
(
'
ncp
'
);
const
http
=
require
(
'
http
'
);
const
unzipper
=
require
(
'
unzipper
'
);
\ No newline at end of file
const
unzipper
=
require
(
'
unzipper
'
);
let
api
=
new
SHAPI
();
\ No newline at end of file
src/assets/js/navigation.js
View file @
d4385397
let
api
=
new
SHAPI
();
let
DOMNavigationItems
=
document
.
querySelectorAll
(
"
aside .item
"
);
let
DOMSections
=
document
.
querySelectorAll
(
"
section
"
);
...
...
@@ -13,8 +11,7 @@ let currentPreviewAudio;
function
NavigateToSection
(
sectionIndex
)
{
// Stop audio if playing
if
(
currentPreviewAudio
)
currentPreviewAudio
.
pause
();
SongDetailStopPreview
();
// Navigation
DOMNavigationItems
.
forEach
(
function
(
DOMNavigation
)
{
...
...
@@ -35,8 +32,7 @@ NavigateToSection(0);
function
NavigateToSongDetail
(
songId
)
{
// Stop audio if playing
if
(
currentPreviewAudio
)
currentPreviewAudio
.
pause
();
SongDetailStopPreview
();
// Navigation
DOMNavigationItems
.
forEach
(
function
(
DOMNavigation
)
{
...
...
src/assets/js/section.songdetail.js
View file @
d4385397
...
...
@@ -3,6 +3,7 @@ const DOMSongDetailActions = document.querySelector(".song-detail-actions");
const
DOMSongDetail
=
document
.
querySelector
(
"
.section-song-detail .song-detail
"
);
const
DOMSongDetailCover
=
document
.
querySelector
(
"
.section-song-detail .song-cover
"
);
let
isPlayingPreview
=
false
;
const
DOMButtonPreview
=
DOMSongDetailActions
.
querySelector
(
"
.button-preview
"
);
...
...
@@ -48,19 +49,29 @@ function SongDetailLoad(songId) {
}
function
SongDetailTogglePreview
()
{
if
(
currentPreviewAudio
!=
undefined
||
currentPreviewAudio
!=
null
)
{
if
(
isPlayingPreview
)
{
SongDetailStopPreview
();
}
else
{
SongDetailStartPreview
();
}
}
function
SongDetailStartPreview
()
{
currentPreviewAudio
=
new
Audio
(
currentSongData
.
paths
.
ogg
);
currentPreviewAudio
.
play
();
isPlayingPreview
=
true
;
DOMButtonPreview
.
innerText
=
"
PAUSE PREVIEW
"
;
DOMButtonPreview
.
classList
.
add
(
"
button-primary
"
);
}
function
SongDetailStopPreview
()
{
if
(
currentPreviewAudio
)
{
currentPreviewAudio
.
pause
();
currentPreviewAudio
.
currentTime
=
0
;
currentPreviewAudio
=
null
;
DOMButtonPreview
.
innerText
=
"
PLAY PREVIEW
"
;
DOMButtonPreview
.
classList
.
remove
(
"
button-primary
"
);
}
else
{
currentPreviewAudio
=
new
Audio
(
currentSongData
.
paths
.
ogg
);
currentPreviewAudio
.
play
();
DOMButtonPreview
.
innerText
=
"
PAUSE PREVIEW
"
;
DOMButtonPreview
.
classList
.
add
(
"
button-primary
"
);
}
currentPreviewAudio
=
null
;
isPlayingPreview
=
false
;
DOMButtonPreview
.
innerText
=
"
PLAY PREVIEW
"
;
DOMButtonPreview
.
classList
.
remove
(
"
button-primary
"
);
}
function
SongDetailDownload
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment