Nighthawk/roll20-character-sheets
1
0
Fork 0
mirror of https://github.com/Nighthawk42/roll20-character-sheets.git synced 2026-08-30 03:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed the warning box to an auto removal as there is no reason for people to have to do the work manually.

Browse Source
This commit is contained in:
Peter Bjerg Lidegaard
2026-04-03 14:31:58 +02:00
parent 2106c1f299
commit 63cab8f11d
3 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ADnD_2E_Revised/2ESheet.html
+25 -30
View File
@@ -9,7 +9,7 @@
<h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
<div class="sheet-announce-items">
<ul style="font-style:italic">
<li>Show warning box when character name contains special characters as these tend to break buttons and calculations.</li>
<li>Automatically removing the following characters (){}[]" from character names as these break sheet functionality.</li>
</ul>
<hr>
<p>
@@ -71252,6 +71252,10 @@ const displaySize = function(size) {
}
}
const unique = function (value, index, array) {
return array.indexOf(value) === index;
}
const sizeToInt = function(size) {
if (typeof size !== 'string' || size.length === 0)
return '';
@@ -71624,42 +71628,33 @@ on('clicked:hide-toast', function(eventInfo) {
});
});
//#region Text field correction
const SPECIAL_CHARACTER_REGEX = /[(){}\[\]"]/g
on('change:character_name', function (eventInfo) {
getAttrs(['character_name'], function (values) {
let characterName = values.character_name.trim()
if (!characterName)
return false;
console.log(eventInfo);
if (isSheetWorkerUpdate(eventInfo)) {
return;
}
let message = `Your character's name contains`;
let suffix = `This can break various buttons and calculations on the sheet.\n\nPlease remove special characters to ensure the sheet functions as expected. Alternatively try using single quotes ' as these has not yet caused any issues.`
if (!eventInfo.newValue) {
return;
}
let parenthesis = (characterName.match(/[()]/g) || []).length
if (parenthesis > 0) {
showToast(ERROR, 'Parenthesis in Character name', `${message} parenthesis '()'. ${suffix}`);
return false;
}
let specialCharacters = eventInfo.newValue.match(SPECIAL_CHARACTER_REGEX)
if (!specialCharacters) {
return;
}
let curlyBracket = (characterName.match(/[{}]/g) || []).length
if (curlyBracket > 0) {
showToast(ERROR, 'Curly brackets in Character name', `${message} curly brackets '{}'. ${suffix}'`);
return false;
}
let message = `@{${eventInfo.sourceAttribute}} had the special characters '${specialCharacters.filter(unique).join(", ")}'. As these can break various buttons, calculations, and functionality on the sheet, they have been removed.\n\nFor flavor names, try using single quotes ' as these has not yet caused any issues. For instance: Thaldrin 'Hawkeye' Ravenflock.`
let squareBrackets = (characterName.match(/[\[\]]/g) || []).length
if (squareBrackets > 0) {
showToast(ERROR, 'Square brackets in Character name', `${message} square brackets '[]'. ${suffix}`);
return false;
}
let doubleQuotes = (characterName.match(/"/g) || []).length
if (doubleQuotes > 0) {
showToast(ERROR, 'Double quotes in Character name', `${message} double quotes '"'. ${suffix}`);
return false;
}
let toast = getToastObject(INFO, "Special characters removed", message);
let newValue = {...toast};
newValue[eventInfo.sourceAttribute] = eventInfo.newValue.replaceAll(SPECIAL_CHARACTER_REGEX, '');
return true;
})
setAttrs(newValue);
})
//#endregion
//#region Ability Scores logic
// Ability Score Parser function
@@ -73912,7 +73907,7 @@ function critEffectExplanations(critEffect, set) {
return;
injuryMatch = injuryMatch.map(s => s.toLowerCase().replace('internal ', '').trim())
.filter((v, i, a) => a.indexOf(v) === i);
.filter(unique);
injuryMatch.forEach(key => {
switch (key) {
case 'graze':
ADnD_2E_Revised/html/changelog.html
+1 -1
View File
@@ -4,7 +4,7 @@
<h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
<div class="sheet-announce-items">
<ul style="font-style:italic">
<li>Show warning box when character name contains special characters as these tend to break buttons and calculations.</li>
<li>Automatically removing the following characters (){}[]" from character names as these break sheet functionality.</li>
</ul>
<hr>
<p>
ADnD_2E_Revised/javascript/sheetWorkers.js
+24 -29
View File
@@ -117,6 +117,10 @@ const displaySize = function(size) {
}
}
const unique = function (value, index, array) {
return array.indexOf(value) === index;
}
const sizeToInt = function(size) {
if (typeof size !== 'string' || size.length === 0)
return '';
@@ -489,42 +493,33 @@ on('clicked:hide-toast', function(eventInfo) {
});
});
//#region Text field correction
const SPECIAL_CHARACTER_REGEX = /[(){}\[\]"]/g
on('change:character_name', function (eventInfo) {
getAttrs(['character_name'], function (values) {
let characterName = values.character_name.trim()
if (!characterName)
return false;
console.log(eventInfo);
if (isSheetWorkerUpdate(eventInfo)) {
return;
}
let message = `Your character's name contains`;
let suffix = `This can break various buttons and calculations on the sheet.\n\nPlease remove special characters to ensure the sheet functions as expected. Alternatively try using single quotes ' as these has not yet caused any issues.`
if (!eventInfo.newValue) {
return;
}
let parenthesis = (characterName.match(/[()]/g) || []).length
if (parenthesis > 0) {
showToast(ERROR, 'Parenthesis in Character name', `${message} parenthesis '()'. ${suffix}`);
return false;
}
let specialCharacters = eventInfo.newValue.match(SPECIAL_CHARACTER_REGEX)
if (!specialCharacters) {
return;
}
let curlyBracket = (characterName.match(/[{}]/g) || []).length
if (curlyBracket > 0) {
showToast(ERROR, 'Curly brackets in Character name', `${message} curly brackets '{}'. ${suffix}'`);
return false;
}
let message = `@{${eventInfo.sourceAttribute}} had the special characters '${specialCharacters.filter(unique).join(", ")}'. As these can break various buttons, calculations, and functionality on the sheet, they have been removed.\n\nFor flavor names, try using single quotes ' as these has not yet caused any issues. For instance: Thaldrin 'Hawkeye' Ravenflock.`
let squareBrackets = (characterName.match(/[\[\]]/g) || []).length
if (squareBrackets > 0) {
showToast(ERROR, 'Square brackets in Character name', `${message} square brackets '[]'. ${suffix}`);
return false;
}
let doubleQuotes = (characterName.match(/"/g) || []).length
if (doubleQuotes > 0) {
showToast(ERROR, 'Double quotes in Character name', `${message} double quotes '"'. ${suffix}`);
return false;
}
let toast = getToastObject(INFO, "Special characters removed", message);
let newValue = {...toast};
newValue[eventInfo.sourceAttribute] = eventInfo.newValue.replaceAll(SPECIAL_CHARACTER_REGEX, '');
return true;
})
setAttrs(newValue);
})
//#endregion
//#region Ability Scores logic
// Ability Score Parser function
@@ -2777,7 +2772,7 @@ function critEffectExplanations(critEffect, set) {
return;
injuryMatch = injuryMatch.map(s => s.toLowerCase().replace('internal ', '').trim())
.filter((v, i, a) => a.indexOf(v) === i);
.filter(unique);
injuryMatch.forEach(key => {
switch (key) {
case 'graze':