oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-31 15:08:31 +00:00
Code Wiki Activity

Merge branch 'master' into socketdev

Browse source
This commit is contained in:
Kane York 2015-10-27 18:26:28 -07:00
commit 2fd1817627
30 changed files with 898 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ember/channel.js
View file

@ -456,10 +456,9 @@ FFZ.prototype._modify_cindex = function(view) {
el = stat_el && stat_el.querySelector('span'),
player_cont = f.players && f.players[channel_id],
player = player_cont && player_cont.player,
player = player_cont && player_cont.ffz_player,
stats = player && player.stats;
if ( ! container || ! f.settings.player_stats || ! stats || stats.hlsLatencyBroadcaster === 'NaN' || stats.hlsLatencyBroadcaster === NaN ) {
if ( stat_el )
stat_el.parentElement.removeChild(stat_el);
@ -509,7 +508,7 @@ FFZ.prototype._modify_cindex = function(view) {
el = stat_el && stat_el.querySelector('span'),
player_cont = f.players && f.players[hosted_id],
player = player_cont && player_cont.player,
player = player_cont && player_cont.ffz_player,
stats = player && player.stats;