Merge pull request #363 from WatWowMap/minor-pokemon-popup-fixes

TurtIeSocks · web-flow · commit 5a4e2373dd2a · 2021-04-15T10:29:46.000-04:00
Minor Popup Adjustments
diff --git a/static/css/popups.css b/static/css/popups.css
@@ -66,7 +66,7 @@
 }
 
 .pokemon-despawn-timers {
-  grid-column: 1;
+  grid-column: 2;
   grid-row: 5;
   margin: auto;
   padding: 5px;
@@ -89,7 +89,7 @@
 }
 
 .pokemon-other-timers {
-  grid-column: 2;
+  grid-column: 1;
   grid-row: 5;
   margin: auto;
   padding: 5px;
diff --git a/static/js/index.js b/static/js/index.js
@@ -3077,7 +3077,7 @@ const getPokemonPopupContent = (pokemon) => {
   }
 
   const getIV = (pokemon) => {
-    if (pokemon.atk_iv !== null && popupDetails.pokemon.iv) {
+    if (pokemon.atk_iv !== null && pokemon.atk_iv !== undefined && popupDetails.pokemon.iv) {
       const ivColors = { 0: 'red', 66: 'orange', 82: 'yellow', 100: 'green' }
       const ivPercent = ((pokemon.atk_iv + pokemon.def_iv + pokemon.sta_iv) / .45).toFixed(2);
       let selectedColor

Original file line number	Diff line number	Diff line change
`@@ -3077,7 +3077,7 @@ const getPokemonPopupContent = (pokemon) => {`
`3077`	`3077`	`}`
`3078`	`3078`
`3079`	`3079`	`const getIV = (pokemon) => {`
`3080`		`- if (pokemon.atk_iv !== null && popupDetails.pokemon.iv) {`
	`3080`	`+ if (pokemon.atk_iv !== null && pokemon.atk_iv !== undefined && popupDetails.pokemon.iv) {`
`3081`	`3081`	`const ivColors = { 0: 'red', 66: 'orange', 82: 'yellow', 100: 'green' }`
`3082`	`3082`	`const ivPercent = ((pokemon.atk_iv + pokemon.def_iv + pokemon.sta_iv) / .45).toFixed(2);`
`3083`	`3083`	`let selectedColor`