dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed minor bug with "shattered wormholes" (system effect tooltip can not be displayed if wh-type is not defined)

Browse Source
This commit is contained in:
Exodus4D
2016-10-29 13:52:17 +02:00
parent 4e8ccd4bf6
commit 70d8974e19
2 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
js/app/ui/system_info.js
View File

@@ -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 ----------------------------------------------------------

34
public/js/v1.1.7/app/ui/system_info.js
View File

@@ -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 ----------------------------------------------------------