anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix info in terminate stream modal

Browse Source
This commit is contained in:
JonnyWong16
2017-12-12 22:22:38 -08:00
parent 117c228672
commit e28965f8b3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/interfaces/default/index.html
View File

@@ -522,7 +522,7 @@
setInterval(function(){ setInterval(function(){
$('.progress_time_offset').each(function () { $('.progress_time_offset').each(function () {
if ($(this).data('state') === 'playing' && $(this).data('view_offset')) { if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
var view_offset = parseInt($(this).data('view_offset')); var view_offset = parseInt($(this).data('view_offset'));
var stream_duration = parseInt($(this).data('stream_duration')); var stream_duration = parseInt($(this).data('stream_duration'));
var timestamp = millisecondsToMinutes(Math.min(view_offset, stream_duration), false); var timestamp = millisecondsToMinutes(Math.min(view_offset, stream_duration), false);
@@ -530,7 +530,7 @@
} }
}); });
$('.progress-bar').each(function () { $('.progress-bar').each(function () {
if ($(this).data('state') === 'playing' && $(this).data('view_offset')) { if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
var view_offset = parseInt($(this).data('view_offset')); var view_offset = parseInt($(this).data('view_offset'));
var stream_duration = parseInt($(this).data('stream_duration')); var stream_duration = parseInt($(this).data('stream_duration'));
var progress_percent = Math.min(Math.trunc(view_offset / stream_duration * 100), 100) var progress_percent = Math.min(Math.trunc(view_offset / stream_duration * 100), 100)
@@ -576,7 +576,7 @@
e.preventDefault(); e.preventDefault();
var session_id = $(this).data('id'); var session_id = $(this).data('id');
var key = $(this).data('key'); var key = $(this).data('key');
var instance = $('#instance-' + key); var instance = $('#activity-instance-' + key);
$('#terminate-user').text(instance.find('.dashboard-activity-metadata-user').text()); $('#terminate-user').text(instance.find('.dashboard-activity-metadata-user').text());
$('#terminate-title').text(instance.find('.dashboard-activity-metadata-title').text()); $('#terminate-title').text(instance.find('.dashboard-activity-metadata-title').text());
@@ -598,7 +598,6 @@
success: function (data) { success: function (data) {
if (data.result === 'success') { if (data.result === 'success') {
setTimeout(function() { setTimeout(function() {
currentActivityHeader();
getCurrentActivity(); getCurrentActivity();
showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000); showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
}, 2500); }, 2500);