Merge pull request #302 from WatWowMap/fix-219

Display raid pokemon before hatch if available

Author: versx

static/js/index.js

@@ -3275,7 +3275,7 @@ function getGymPopupContent (gym) {
     if (isRaid) {
         let hasRaidBoss = gym.raid_pokemon_id !== 0 && gym.raid_pokemon_id !== null;
         let pokemonName;
-        if (hasRaidBoss && isRaidBattle) {
+        if (hasRaidBoss) {
             if (gym.raid_pokemon_form !== 0 && gym.raid_pokemon_form !== null) {
                 pokemonName = getFormName(gym.raid_pokemon_form) + ' ' + getPokemonName(gym.raid_pokemon_id);
             } else {
@@ -3292,15 +3292,15 @@ function getGymPopupContent (gym) {
         '<div class="row" style="margin:auto;">' + // START 1ST ROW
             '<div class="col-4">' + // START 1ST COL
                 '<div class="row pokemon-popup-image-holder">';
-        if (hasRaidBoss && isRaidBattle) {
+        if (hasRaidBoss) {
             content += `<img src="${availableIconStyles[selectedIconStyle].path}/${pokemonIcon}.png">`;
         } else {
             content += `<img src="/img/egg/${gym.raid_level}.png">`;
         }
         content +=
                 '</div>' + // END POKEMON ROW
                 '<div class="row" style="margin:auto;">';
-        if (hasRaidBoss && isRaidBattle) {
+        if (hasRaidBoss) {
             const pkmn = masterfile.pokemon[gym.raid_pokemon_id];
             if (pkmn !== undefined && pkmn !== null) {
                 const types = pkmn.types;
@@ -3321,7 +3321,7 @@ function getGymPopupContent (gym) {
             '</div>' + // END 1ST COLUMN
             '<div class="col-8 text-nowrap">' + // START 2ND COL
                 '<h7><b>' + pokemonName + '</b></h7><br>';
-        if (hasRaidBoss && isRaidBattle) {
+        if (hasRaidBoss) {
             if (gym.raid_pokemon_evolution) {
                 content += '<b>Evolution:</b> ' + getEvolutionName(gym.raid_pokemon_evolution) + '<br>';
             }