From 5d8da23c3f9f9879d79227a2b0f8653befc516f3 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 31 Oct 2017 23:28:01 -0700 Subject: [PATCH] Add pseudo view offset counter --- .../default/current_activity_instance.html | 4 ++-- data/interfaces/default/index.html | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index bf10cdc1..589d4222 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -282,11 +282,11 @@ DOCUMENTATION :: END -
+
- / + / diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index fb26eaa0..24d2e78d 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -227,7 +227,6 @@ } }); } - currentActivityHeader(); function getCurrentActivity() { $.ajax({ @@ -431,7 +430,10 @@ // Update the stream progress times $('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format)); - $('#stream-view-offset-' + key).html(millisecondsToMinutes(s.view_offset, false)); + $('#stream-view-offset-' + key).data('state', s.state); + if ($('#stream-view-offset-' + key).data('last_view_offset') != s.view_offset) { + $('#stream-view-offset-' + key).data('last_view_offset', s.view_offset).data('view_offset', s.view_offset); + } // Update the progress bars, percent - 3 because of 3px padding-right $('#buffer-bar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%') @@ -477,12 +479,23 @@ }); } + currentActivityHeader(); getCurrentActivity(); setInterval(function () { currentActivityHeader(); getCurrentActivity(); }, 2000); + setInterval( function(){ + $('.progress_time_offset').each(function () { + if ($(this).data('state') === 'playing') { + var ms = parseInt($(this).data('view_offset')); + var timestamp = millisecondsToMinutes(ms, false); + $(this).html(timestamp).data('view_offset', ms + 1000) + } + }); + }, 1000); + $('#currentActivity').on('click', '.external_ip-modal', function () { $.get('get_ip_address_details', { ip_address: $(this).data('ip')