minor adjustments
parent
85a1489da7
commit
592eb0dc51
|
@ -78,14 +78,16 @@ function base64ArrayBuffer(arrayBuffer) {
|
|||
function timeAgo(date) {
|
||||
const now = new Date();
|
||||
const secondsPast = (now.getTime() - date.getTime()) / 1000;
|
||||
|
||||
if(secondsPast < 60) {
|
||||
return parseInt(secondsPast) + ' seconds ago';
|
||||
}
|
||||
if(secondsPast < 3600) {
|
||||
return parseInt(secondsPast/60) + ' minutes ago';
|
||||
return parseInt(secondsPast / 60) + ' minutes ago';
|
||||
}
|
||||
return parseInt(secondsPast/3600) + ' hours ago';
|
||||
if(secondsPast < 86400) {
|
||||
return parseInt(secondsPast / 3600) + ' hours ago';
|
||||
}
|
||||
return parseInt(secondsPast / 86400) + ' days ago';
|
||||
}
|
||||
function getDayOfWeek(date) {
|
||||
const days = [lang.Sunday, lang.Monday, lang.Tuesday, lang.Wednesday, lang.Thursday, lang.Friday, lang.Saturday];
|
||||
|
|
|
@ -361,6 +361,7 @@ $(document).ready(function(){
|
|||
var monitorId = oldVideo.mid
|
||||
loadedVideosOnCanvas[monitorId] = null
|
||||
loadedVideoElsOnCanvas[monitorId] = null
|
||||
clearTimeout(loadedVideoEndingTimeouts[monitorId])
|
||||
var container = getVideoContainerInCanvas(oldVideo).addClass('no-video')
|
||||
var videoEl = container.find('video')
|
||||
videoEl.attr('src','')
|
||||
|
@ -539,6 +540,9 @@ $(document).ready(function(){
|
|||
$.each(loadedVideoElsOnCanvasNextVideoTimeout,function(n,timeout){
|
||||
clearTimeout(timeout)
|
||||
})
|
||||
$.each(loadedVideoEndingTimeouts,function(n,timeout){
|
||||
clearTimeout(timeout)
|
||||
})
|
||||
setPlayToggleUI(`play-circle-o`)
|
||||
}
|
||||
}
|
||||
|
@ -737,6 +741,7 @@ $(document).ready(function(){
|
|||
autoApply: true,
|
||||
buttonClasses: 'hidden',
|
||||
drops: 'up',
|
||||
maxDate: new Date(),
|
||||
onChange: function(start, end, label) {
|
||||
if(!timeChanging){
|
||||
setLoadingMask(true)
|
||||
|
|
Loading…
Reference in New Issue