github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-31 12:00:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure current activity is loaded before refreshing

Browse source
This commit is contained in:
JonnyWong16 2017-12-29 16:26:50 -08:00
parent 8b2bd5ce79
commit 41f91956b8
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
data/interfaces/default/index.html
View file

@ -235,7 +235,12 @@
} }
}; };
var create_instances = [];
var activity_ready = true;
function getCurrentActivity() { function getCurrentActivity() {
activity_ready = false;
$.ajax({ $.ajax({
url: 'get_activity', url: 'get_activity',
type: 'GET', type: 'GET',
@ -298,6 +303,7 @@
// Create a new instance if it doesn't exist // Create a new instance if it doesn't exist
if (!(instance.length)) { if (!(instance.length)) {
create_instances.push(key);
getActivityInstance(key); getActivityInstance(key);
return; return;
} }
@ -501,6 +507,8 @@
$('#currentActivityHeader').text(''); $('#currentActivityHeader').text('');
$('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">Nothing is currently being played.</div>'); $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">Nothing is currently being played.</div>');
} }
activity_ready = true;
} }
}); });
} }
@ -520,13 +528,20 @@
$('#activity-instance-' + session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 }); $('#activity-instance-' + session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 });
$('#terminate-button-' + session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 }); $('#terminate-button-' + session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 });
lockScroll('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller'); lockScroll('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller');
var index = create_instances.indexOf(session_key);
if (index > -1) {
create_instances.splice(index, 1);
}
} }
}); });
} }
getCurrentActivity(); getCurrentActivity();
setInterval(function () { setInterval(function () {
getCurrentActivity(); if (!(create_instances.length) && activity_ready) {
getCurrentActivity();
}
}, 2000); }, 2000);
setInterval(function(){ setInterval(function(){