brian/ictgj-voting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Scrub newlines out of game descriptions

Browse Source
This commit is contained in:
Brian Buller 2018-01-26 12:31:06 -06:00
parent 8afac6a29b
commit 9b03710ed0
3 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
assets.go
View File

@ -12181,47 +12181,48 @@ AAAA//9ablv2IQMAAA==
"/templates/public-teammgmt.html": { "/templates/public-teammgmt.html": {
local: "templates/public-teammgmt.html", local: "templates/public-teammgmt.html",
size: 10204, size: 10350,
modtime: 1506689947, modtime: 1516991375,
compressed: ` compressed: `
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
TMvrt/8FAAD//x6rSUXcJwAA 7ivwVcwfIfpVQtT9Dul3FqTPEETn4vRz80AwSAMR9VkRGg76OkghAltXNZMdFju0hFr7Z0tzUGGvB1bH
q8W0uhD8XwAAAP//sEEPq24oAAA=
`, `,
}, },

8
templates/admin-editteam.html
View File

@ -215,7 +215,7 @@
// Check if Game Details changed // Check if Game Details changed
if(document.getElementById('gamename').value != '{{ .TemplateData.Game.Name }}') { return true; } if(document.getElementById('gamename').value != '{{ .TemplateData.Game.Name }}') { return true; }
if(document.getElementById('gamelink').value != '{{ .TemplateData.Game.Link }}') { return true; } if(document.getElementById('gamelink').value != '{{ .TemplateData.Game.Link }}') { return true; }
if(document.getElementById('gamedesc').value != '{{ .TemplateData.Game.Description }}') { return true; } if(scrubString(document.getElementById('gamedesc').value) != scrubString('{{ .TemplateData.Game.Description }}')) { return true; }
// Check if new member details have been entered // Check if new member details have been entered
if(document.getElementById('newmembername').value != '') { return true; } if(document.getElementById('newmembername').value != '') { return true; }
if(document.getElementById('newmemberslackid').value != '') { return true; } if(document.getElementById('newmemberslackid').value != '') { return true; }
@ -224,6 +224,12 @@
return false; return false;
} }
function scrubString(inp) {
inp = inp.replace(/\r\n/g, "");
inp = inp.replace(/\n/g, "");
return inp
}
function revertChanges() { function revertChanges() {
// Reset Team Name // Reset Team Name
document.getElementById('teamname').value = '{{ .TemplateData.Name }}'; document.getElementById('teamname').value = '{{ .TemplateData.Name }}';

8
templates/public-teammgmt.html
View File

@ -177,7 +177,7 @@
// Check if game details have changed // Check if game details have changed
if(document.getElementById('gamename').value != '{{ .TemplateData.Game.Name }}') { return true; } if(document.getElementById('gamename').value != '{{ .TemplateData.Game.Name }}') { return true; }
if(document.getElementById('gamelink').value != '{{ .TemplateData.Game.Link }}') { return true; } if(document.getElementById('gamelink').value != '{{ .TemplateData.Game.Link }}') { return true; }
if(document.getElementById('gamedesc').value != '{{ .TemplateData.Game.Description }}') { return true; } if(scrubString(document.getElementById('gamedesc').value) != scrubString('{{ .TemplateData.Game.Description }}')) { return true; }
// Check if new member details have been entered // Check if new member details have been entered
if(document.getElementById('newmembername').value != '') { return true; } if(document.getElementById('newmembername').value != '') { return true; }
if(document.getElementById('newmemberslackid').value != '') { return true; } if(document.getElementById('newmemberslackid').value != '') { return true; }
@ -186,6 +186,12 @@
return false; return false;
} }
function scrubString(inp) {
inp = inp.replace(/\r\n/g, "");
inp = inp.replace(/\n/g, "");
return inp
}
function revertChanges() { function revertChanges() {
// Reset game details // Reset game details
document.getElementById('gamename').value = '{{ .TemplateData.Game.Name }}'; document.getElementById('gamename').value = '{{ .TemplateData.Game.Name }}';