MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'airsonic/pr/907'

Browse Source
This commit is contained in:
Andrew DeMaria
2019-03-31 19:19:44 -04:00
parent c9a209fd8f 0b72acefed
commit 6613bd86d5
4 changed files with 4 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
-1
View File
@@ -3,7 +3,6 @@
<html><head> <html><head>
<%@ include file="head.jsp" %> <%@ include file="head.jsp" %>
<%@ include file="jquery.jsp" %> <%@ include file="jquery.jsp" %>
<script type="text/javascript" src="<c:url value="/script/moment-2.18.1.min.js"/>"></script>
<link type="text/css" rel="stylesheet" href="<c:url value="/script/webfx/luna.css"/>"> <link type="text/css" rel="stylesheet" href="<c:url value="/script/webfx/luna.css"/>">
<script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script> <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/interface/nowPlayingService.js"/>"></script> <script type="text/javascript" src="<c:url value="/dwr/interface/nowPlayingService.js"/>"></script>
airsonic-main/src/main/webapp/script/moment-2.18.1.min.js
Vendored
-7
View File
File diff suppressed because one or more lines are too long
airsonic-main/src/main/webapp/script/moment-with-locales-2.18.1.min.js
Vendored
-505
View File
File diff suppressed because one or more lines are too long
airsonic-main/src/main/webapp/script/playQueue/javaJukeboxPlayerControlBar.js
+4 -7
View File
@@ -68,13 +68,10 @@ function updateJavaJukeboxPlayerControlBar(song){
} }
function songTimeAsString(timeInSeconds) { function songTimeAsString(timeInSeconds) {
var m = moment.duration(timeInSeconds, 'seconds'); var minutes = Math.floor(timeInSeconds / 60);
var seconds = m.seconds(); var seconds = timeInSeconds - minutes * 60;
var secondsAsString = seconds;
if (seconds < 10) { return minutes + ":" + ("00" + seconds).slice(-2);
secondsAsString = "0" + seconds;
}
return m.minutes() + ":" + secondsAsString;
} }
function newSongPlaying(song) { function newSongPlaying(song) {