Merge pull request #5208 from Artie18/master

Fixed issue with word count for non ASCII letters.
TryGhost · May 3, 2015 · 6244165 · 6244165
2 parents 7fe63b2 + 075c4fb
commit 6244165
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/core/client/Brocfile.js b/core/client/Brocfile.js
@@ -59,5 +59,6 @@ app.import('bower_components/codemirror/mode/htmlmixed/htmlmixed.js');
 app.import('bower_components/codemirror/mode/xml/xml.js');
 app.import('bower_components/codemirror/mode/css/css.js');
 app.import('bower_components/codemirror/mode/javascript/javascript.js');
+app.import('bower_components/xregexp/xregexp-all.js');
 
 module.exports = app.toTree();
diff --git a/core/client/app/utils/word-count.js b/core/client/app/utils/word-count.js
@@ -1,7 +1,12 @@
 // jscs: disable
+/* global XRegExp */
+
 function wordCount(s) {
+
+    var nonANumLetters = new XRegExp("[^\\s\\d\\p{L}]", "g"); // all non-alphanumeric letters regexp
+
     s = s.replace(/<(.|\n)*?>/g, ' '); // strip tags
-    s = s.replace(/[^\w\s]/g, ''); // ignore non-alphanumeric letters
+    s = s.replace(nonANumLetters, ''); // ignore non-alphanumeric letters
     s = s.replace(/(^\s*)|(\s*$)/gi, ''); // exclude starting and ending white-space
     s = s.replace(/\n /gi, ' '); // convert newlines to spaces
     s = s.replace(/\n+/gi, ' ');

diff --git a/core/client/bower.json b/core/client/bower.json
@@ -25,7 +25,8 @@
     "nprogress": "0.1.6",
     "rangyinputs": "1.2.0",
     "showdown-ghost": "0.3.6",
-    "validator-js": "3.39.0"
+    "validator-js": "3.39.0",
+    "xregexp": "2.0.0"
 
   },
   "devDependencies": {