From 70d8974e19e83e228c841cd15bd4a6e5490e03bb Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Sat, 29 Oct 2016 13:52:17 +0200 Subject: [PATCH] - fixed minor bug with "shattered wormholes" (system effect tooltip can not be displayed if wh-type is not defined) --- js/app/ui/system_info.js | 34 +++++++++++++++----------- public/js/v1.1.7/app/ui/system_info.js | 34 +++++++++++++++----------- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/js/app/ui/system_info.js b/js/app/ui/system_info.js index 9a9b077f..cb39b2df 100644 --- a/js/app/ui/system_info.js +++ b/js/app/ui/system_info.js @@ -376,23 +376,29 @@ define([ tooltipElements.tooltip(); // init system effect popover ---------------------------------------------------------------- - var systemEffectData = Util.getSystemEffectData( systemData.security, systemData.effect); + var infoEffectElement = $(moduleElement).find('.' + config.systemInfoEffectInfoClass); - if(systemEffectData !== false){ - var infoEffectElement = $(moduleElement).find('.' + config.systemInfoEffectInfoClass); + if(infoEffectElement.length){ + // effect row exists -> get effect data + var systemEffectData = Util.getSystemEffectData( systemData.security, systemData.effect); - // transform data into table - var systemEffectTable = Util.getSystemEffectTable( systemEffectData ); + if(systemEffectData !== false){ + // transform data into table + var systemEffectTable = Util.getSystemEffectTable( systemEffectData ); - infoEffectElement.popover({ - html: true, - trigger: 'hover', - placement: 'top', - delay: 200, - title: 'System effects', - container: 'body', - content: systemEffectTable - }); + infoEffectElement.popover({ + html: true, + trigger: 'hover', + placement: 'top', + delay: 200, + title: 'System effects', + container: 'body', + content: systemEffectTable + }); + }else{ + // effect data not found (e.g. !unknown! shattered system) -> hide "popover" icon icon + infoEffectElement.children().hide(); + } } // init static wormhole information ---------------------------------------------------------- diff --git a/public/js/v1.1.7/app/ui/system_info.js b/public/js/v1.1.7/app/ui/system_info.js index 9a9b077f..cb39b2df 100644 --- a/public/js/v1.1.7/app/ui/system_info.js +++ b/public/js/v1.1.7/app/ui/system_info.js @@ -376,23 +376,29 @@ define([ tooltipElements.tooltip(); // init system effect popover ---------------------------------------------------------------- - var systemEffectData = Util.getSystemEffectData( systemData.security, systemData.effect); + var infoEffectElement = $(moduleElement).find('.' + config.systemInfoEffectInfoClass); - if(systemEffectData !== false){ - var infoEffectElement = $(moduleElement).find('.' + config.systemInfoEffectInfoClass); + if(infoEffectElement.length){ + // effect row exists -> get effect data + var systemEffectData = Util.getSystemEffectData( systemData.security, systemData.effect); - // transform data into table - var systemEffectTable = Util.getSystemEffectTable( systemEffectData ); + if(systemEffectData !== false){ + // transform data into table + var systemEffectTable = Util.getSystemEffectTable( systemEffectData ); - infoEffectElement.popover({ - html: true, - trigger: 'hover', - placement: 'top', - delay: 200, - title: 'System effects', - container: 'body', - content: systemEffectTable - }); + infoEffectElement.popover({ + html: true, + trigger: 'hover', + placement: 'top', + delay: 200, + title: 'System effects', + container: 'body', + content: systemEffectTable + }); + }else{ + // effect data not found (e.g. !unknown! shattered system) -> hide "popover" icon icon + infoEffectElement.children().hide(); + } } // init static wormhole information ----------------------------------------------------------