Merge branch 'feature/unicode-normalization' into develop

2012-08-13 17:12:11 +01:00 · 2012-08-13 17:12:11 +01:00 · f29d08c103
parent 71d6d520e8 699aa299f8
commit f29d08c103
2 changed files with 406 additions and 1 deletions
--- a/src/static/js/contentcollector.js
+++ b/src/static/js/contentcollector.js
@ -25,13 +25,14 @@

 var _MAX_LIST_LEVEL = 8;

+var UNorm = require('./unorm');
 var Changeset = require('./Changeset');
 var hooks = require('./pluginfw/hooks');
 var _ = require('./underscore');

 function sanitizeUnicode(s)
 {
-  return s.replace(/[\uffff\ufffe\ufeff\ufdd0-\ufdef\ud800-\udfff]/g, '?');
+  return UNorm.nfc(s).replace(/[\uffff\ufffe\ufeff\ufdd0-\ufdef\ud800-\udfff]/g, '?');
 }

 function makeContentCollector(collectStyles, browser, apool, domInterface, className2Author)
--- a/src/static/js/unorm.js
+++ b/src/static/js/unorm.js