diff --git a/js/app/key.js b/js/app/key.js index 95718194..734523e5 100644 --- a/js/app/key.js +++ b/js/app/key.js @@ -284,10 +284,12 @@ define([ }; let evKeyUp = (e) => { - let key = e.key.toUpperCase(); + if(e.key){ + let key = e.key.toUpperCase(); - if(map.hasOwnProperty(key)){ - delete map[key]; + if(map.hasOwnProperty(key)){ + delete map[key]; + } } }; diff --git a/js/app/ui/dialog/jump_info.js b/js/app/ui/dialog/jump_info.js index a3cd716a..9db535b9 100644 --- a/js/app/ui/dialog/jump_info.js +++ b/js/app/ui/dialog/jump_info.js @@ -47,8 +47,6 @@ define([ }), formatStatic: function(){ return function(value, render){ - console.log(render(value)); - console.log(typeof render(value)); let isStatic = render(value) === 'true'; if(isStatic){ return ''; diff --git a/js/app/ui/system_info.js b/js/app/ui/system_info.js index 56452284..78a4eef0 100644 --- a/js/app/ui/system_info.js +++ b/js/app/ui/system_info.js @@ -372,7 +372,7 @@ define([ } } }; -console.log(systemData) + let moduleData = { system: systemData, static: staticsData, diff --git a/js/app/ui/system_killboard.js b/js/app/ui/system_killboard.js index 2a949d8c..e11c0605 100644 --- a/js/app/ui/system_killboard.js +++ b/js/app/ui/system_killboard.js @@ -24,6 +24,7 @@ define([ systemKillboardListClass: 'pf-system-killboard-list', // class for a list with kill entries systemKillboardListEntryClass: 'pf-system-killboard-list-entry', // class for a list entry systemKillboardListImgShip: 'pf-system-killboard-img-ship', // class for all ship images + systemKillboardListImgChar: 'pf-system-killboard-img-char', // class for all character logos systemKillboardListImgAlly: 'pf-system-killboard-img-ally', // class for all alliance logos systemKillboardListImgCorp: 'pf-system-killboard-img-corp' // class for all corp logos }; @@ -60,125 +61,59 @@ define([ // change order (show right to left) killboardData.tableData.reverse(); - for(let i = 0; i < killboardData.tableData.length; i++){ + let data = { + tableData: killboardData.tableData, + systemKillboardListClass: config.systemKillboardListClass, + systemKillboardListEntryClass: config.systemKillboardListEntryClass, + systemKillboardListImgShip: config.systemKillboardListImgShip, + systemKillboardListImgChar: config.systemKillboardListImgChar, + systemKillboardListImgAlly: config.systemKillboardListImgAlly, + systemKillboardListImgCorp: config.systemKillboardListImgCorp, + zKillboardUrl: 'https://zkillboard.com', + ccpImageServerUrl: Init.url.ccpImageServer, - // check if killMails exist in this hour - if(killboardData.tableData[i].killmails){ - - if(killMailCounter >= killMailCounterMax){ - break; - } - - moduleElement.append( $('
').text( i ? i + 'h ago' : 'recent')); - - let killMailData = killboardData.tableData[i].killmails; - - let listeElement = $('