mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-24 17:10:29 +00:00
Code Issues Releases Wiki Activity

Fix problem with double-byte Unicode entities

Browse Source 
Entities such as `👷` were broken because
`String.fromCharCode()` is not fully Unicode aware. The fix is to use
`String.fromCodePoint()` where available.

Noted by @ericshulman
This commit is contained in:
Jermolene 2016-02-18 13:49:09 +00:00
parent 9158302475
commit 4a03dcab20
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/modules/utils/utils.js
View File

@ -383,17 +383,18 @@ exports.htmlEncode = function(s) {
// Converts all HTML entities to their character equivalents // Converts all HTML entities to their character equivalents
exports.entityDecode = function(s) { exports.entityDecode = function(s) {
var e = s.substr(1,s.length-2); // Strip the & and the ; var converter = String.fromCodePoint || String.fromCharCode;
e = s.substr(1,s.length-2); // Strip the & and the ;
if(e.charAt(0) === "#") { if(e.charAt(0) === "#") {
if(e.charAt(1) === "x" || e.charAt(1) === "X") { if(e.charAt(1) === "x" || e.charAt(1) === "X") {
return String.fromCharCode(parseInt(e.substr(2),16)); return converter(parseInt(e.substr(2),16));
} else { } else {
return String.fromCharCode(parseInt(e.substr(1),10)); return converter(parseInt(e.substr(1),10));
} }
} else { } else {
var c = $tw.config.htmlEntities[e]; var c = $tw.config.htmlEntities[e];
if(c) { if(c) {
return String.fromCharCode(c); return converter(c);
} else { } else {
return s; // Couldn't convert it as an entity, just return it raw return s; // Couldn't convert it as an entity, just return it raw
} }