From b2fb6ddcf0df340d436bca6378c6e78da9f4cfa8 Mon Sep 17 00:00:00 2001 From: soneill Date: Tue, 1 Sep 2020 09:31:57 +1200 Subject: [PATCH] fixes zkill stream for systems with no recent kills --- js/app/ui/module/system_killboard.js | 38 ++++++++++--------- .../v2.0.1/app/ui/module/system_killboard.js | 38 ++++++++++--------- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/js/app/ui/module/system_killboard.js b/js/app/ui/module/system_killboard.js index 29d77a75..0531060b 100644 --- a/js/app/ui/module/system_killboard.js +++ b/js/app/ui/module/system_killboard.js @@ -576,26 +576,28 @@ define([ * @param killmailData */ onWsMessage(zkbData, killmailData){ - - if(!this._killboardEl){ - // Remove label which indicates that there are no kills - let noKillsEl = this._bodyEl.querySelector('.label-success'); - if(noKillsEl){ - this._bodyEl.removeChild(noKillsEl); - } - - // Initialize necessary container nodes - this._killboardEl = document.createElement('ul'); - this._killboardEl.classList.add(this._config.systemKillboardListClass); - - this._bodyEl.append( - this._killboardLabelEl, - this._killboardEl - ); - } - // check if killmail belongs to current filtered "streams" if(this.filterKillmailByStreams(killmailData)){ + + if(!this._killboardEl){ + // Remove label which indicates that there are no kills + let noKillsEl = this._bodyEl.querySelector('.label-success'); + if(noKillsEl){ + this._bodyEl.removeChild(noKillsEl); + } + + // Initialize necessary container nodes + this._killboardEl = document.createElement('ul'); + this._killboardEl.classList.add(this._config.systemKillboardListClass); + + this._bodyEl.append( + this._killboardLabelEl, + this._killboardEl + ); + } + + + // check max limit for WS kill entries this._countKillsWS = (this._countKillsWS || 0) + 1; if(this._countKillsWS > this._config.maxCountKillsWS){ diff --git a/public/js/v2.0.1/app/ui/module/system_killboard.js b/public/js/v2.0.1/app/ui/module/system_killboard.js index 29d77a75..0531060b 100644 --- a/public/js/v2.0.1/app/ui/module/system_killboard.js +++ b/public/js/v2.0.1/app/ui/module/system_killboard.js @@ -576,26 +576,28 @@ define([ * @param killmailData */ onWsMessage(zkbData, killmailData){ - - if(!this._killboardEl){ - // Remove label which indicates that there are no kills - let noKillsEl = this._bodyEl.querySelector('.label-success'); - if(noKillsEl){ - this._bodyEl.removeChild(noKillsEl); - } - - // Initialize necessary container nodes - this._killboardEl = document.createElement('ul'); - this._killboardEl.classList.add(this._config.systemKillboardListClass); - - this._bodyEl.append( - this._killboardLabelEl, - this._killboardEl - ); - } - // check if killmail belongs to current filtered "streams" if(this.filterKillmailByStreams(killmailData)){ + + if(!this._killboardEl){ + // Remove label which indicates that there are no kills + let noKillsEl = this._bodyEl.querySelector('.label-success'); + if(noKillsEl){ + this._bodyEl.removeChild(noKillsEl); + } + + // Initialize necessary container nodes + this._killboardEl = document.createElement('ul'); + this._killboardEl.classList.add(this._config.systemKillboardListClass); + + this._bodyEl.append( + this._killboardLabelEl, + this._killboardEl + ); + } + + + // check max limit for WS kill entries this._countKillsWS = (this._countKillsWS || 0) + 1; if(this._countKillsWS > this._config.maxCountKillsWS){