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

6 years ago · 6613bd86d5
parent c9a209fd8f 0b72acefed
commit 6613bd86d5
4 changed files with 4 additions and 520 deletions
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
@ -3,7 +3,6 @@
 <html><head>
    <%@ include file="head.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"/>">
    <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>
--- a/airsonic-main/src/main/webapp/script/moment-2.18.1.min.js
+++ b/airsonic-main/src/main/webapp/script/moment-2.18.1.min.js
--- a/airsonic-main/src/main/webapp/script/moment-with-locales-2.18.1.min.js
+++ b/airsonic-main/src/main/webapp/script/moment-with-locales-2.18.1.min.js
--- a/airsonic-main/src/main/webapp/script/playQueue/javaJukeboxPlayerControlBar.js
+++ b/airsonic-main/src/main/webapp/script/playQueue/javaJukeboxPlayerControlBar.js
@ -68,13 +68,10 @@ function updateJavaJukeboxPlayerControlBar(song){
 }

 function songTimeAsString(timeInSeconds) {
-    var m = moment.duration(timeInSeconds, 'seconds');
-    var seconds = m.seconds();
-    var secondsAsString = seconds;
-    if (seconds < 10) {
-        secondsAsString = "0" + seconds;
-    }
-    return m.minutes() + ":" + secondsAsString;
+    var minutes = Math.floor(timeInSeconds / 60);
+    var seconds = timeInSeconds - minutes * 60;
+
+    return minutes + ":" + ("00" + seconds).slice(-2);
 }

 function newSongPlaying(song) {