Ticket #8759: 8759.2.diff

wp-admin/js/word-count.dev.js

@@ -4 +4 @@
                 settings : {
                         strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
                         clean : /[0-9.(),;:!?%#$¿'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
-                        w : /\S\s+/g, // word-counting regexp
-                        c : /\S/g // char-counting regexp for asian languages
+                        count : /\S\s+/g, // word-counting regexp
                 },
 
                 block : 0,
@@ -25 +24 @@
 
                         setTimeout( function() {
                                 if ( tx ) {
-                                        tx = tx.replace( t.settings.strip, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
-                                        tx = tx.replace( t.settings.clean, '' );
-                                        tx.replace( t.settings[type], function(){tc++;} );
+                                        if ( type == 'w' ) { // word-counting
+                                                tx = tx.replace( t.settings.strip, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
+                                                tx = tx.replace( t.settings.clean, '' );
+                                                tx.replace( t.settings.count, function(){tc++;} );
+                                        }
+                                        else if ( type == 'c' ) { // char-counting for asian languages
+                                                tx = tx.replace( t.settings.strip, '' ).replace( /^ +| +$/gm, '' );
+                                                tx = tx.replace( / +|&nbsp;|&#160;/gi, ' ' );
+                                                tx.replace( /[\S \u00A0\u3000]/g, function(){tc++;} );
+                                        }
                                 }
                                 w.html(tc.toString());