kass/matteo-the-prestige
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #137 from Sakimori/master

Browse Source 
bring indev into line with master re: security patch
This commit is contained in:
Sakimori 2021-01-06 20:00:28 -05:00 committed by GitHub
commit e733059ac1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
static/js/grid_loader.js
View File

@ -88,11 +88,20 @@ const insertGame = (gridboxnum, game) => {
const insertLeague = (league) => { const insertLeague = (league) => {
var btn = document.createElement("BUTTON"); var btn = document.createElement("BUTTON");
btn.className = "filter"; btn.className = "filter";
btn.innerHTML = league; btn.innerHTML = escapeHtml(league);
$('#filters').append(btn); $('#filters').append(btn);
return btn; return btn;
} }
function escapeHtml(unsafe) {
return unsafe
.replace(/&/g, "&")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/"/g, "&quot;")
.replace(/'/g, "&#039;");
}
const clearBox = (box) => { const clearBox = (box) => {
box.className = "emptyslot"; box.className = "emptyslot";
box.timestamp = null; box.timestamp = null;

22
templates/game_box.html
View File

@ -5,18 +5,18 @@ src={% if state.bases[number] %}"/static/img/base_filled.png" alt="{{state.bases
{% if number <= state.outs %}/static/img/out_out.png{% else %}/static/img/out_in.png{% endif %} {% if number <= state.outs %}/static/img/out_out.png{% else %}/static/img/out_in.png{% endif %}
{%- endmacro %} {%- endmacro %}
<div class="header"> <div class="header">
<div class="inning">Inning: {% if state.display_top_of_inning == true %}🔼{% else %}🔽{% endif %} {{ state.display_inning }}/{{ state.max_innings }}</div> <div class="inning">Inning: {% if state.display_top_of_inning == true %}🔼{% else %}🔽{% endif %} {{ state.display_inning | escape }}/{{ state.max_innings | escape }}</div>
<div class="title">{{ state.title }}</div> <div class="title">{{ state.title | escape }}</div>
<div class="weather">{{ state.weather_emoji }} {{ state.weather_text }}</div> <div class="weather">{{ state.weather_emoji | escape }} {{ state.weather_text | escape }}</div>
</div> </div>
<div class="body"> <div class="body">
<div class="teams"> <div class="teams">
<div class="team"> <div class="team">
<div class="team_name">{{ state.away_name }}</div> <div class="team_name">{{ state.away_name | escape }}</div>
<div class="score">{{ state.away_score }}</div> <div class="score">{{ state.away_score }}</div>
</div> </div>
<div class="team"> <div class="team">
<div class="team_name">{{ state.home_name }}</div> <div class="team_name">{{ state.home_name | escape }}</div>
<div class="score">{{ state.home_score }}</div> <div class="score">{{ state.home_score }}</div>
</div> </div>
</div> </div>
@ -38,16 +38,16 @@ src={% if state.bases[number] %}"/static/img/base_filled.png" alt="{{state.bases
</div> </div>
<div class="players"> <div class="players">
<div class="player_type">PITCHER</div> <div class="player_type">PITCHER</div>
<div class="player_name pitcher_name">{{ state.pitcher }}</div> <div class="player_name pitcher_name">{{ state.pitcher | escape }}</div>
<div class="player_type">BATTER</div> <div class="player_type">BATTER</div>
<div class="player_name batter_name">{{ state.batter }}</div> <div class="player_name batter_name">{{ state.batter | escape }}</div>
</div> </div>
<div class="update"> <div class="update">
<div class="update_emoji">{{ state.update_emoji }}</div> <div class="update_emoji">{{ state.update_emoji | escape }}</div>
<div class="update_text">{{ state.update_text }}</div> <div class="update_text">{{ state.update_text | escape }}</div>
</div> </div>
</div> </div>
<div class="footer"> <div class="footer">
<div class="batting">{% if state.display_top_of_inning == true %}{{ state.away_name }}{% else %}{{ state.home_name }}{% endif %} batting.</div> <div class="batting">{% if state.display_top_of_inning == true %}{{ state.away_name | escape }}{% else %}{{ state.home_name | escape }}{% endif %} batting.</div>
<div class="leagueoruser">{{ state.leagueoruser }} (<a href="/game?timestamp={{ timestamp }}">share</a>)</div> <div class="leagueoruser">{{ state.leagueoruser | escape }} (<a href="/game?timestamp={{ timestamp }}">share</a>)</div>
</div> </div>