X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/bf5c68485ef07868ad0a91168ecd0092af7661ae..8f374b7233bc2815ccc387e448d208c5434eb961:/wp-admin/js/word-count.dev.js

diff --git a/wp-admin/js/word-count.dev.js b/wp-admin/js/word-count.dev.js
index bb987af0..b42f5c3b 100644
--- a/wp-admin/js/word-count.dev.js
+++ b/wp-admin/js/word-count.dev.js
@@ -1,18 +1,23 @@
-
-(function($) {
+(function($,undefined) {
 	wpWordCount = {
 
 		settings : {
 			strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
 			clean : /[0-9.(),;:!?%#$¿'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
-			count : /\S\s+/g // counting regexp
+			w : /\S\s+/g, // word-counting regexp
+			c : /\S/g // char-counting regexp for asian languages
 		},
 
 		block : 0,
 
-		wc : function(tx) {
+		wc : function(tx, type) {
 			var t = this, w = $('.word-count'), tc = 0;
 
+			if ( type === undefined )
+				type = wordCountL10n.type;
+			if ( type !== 'w' && type !== 'c' )
+				type = 'w';
+
 			if ( t.block )
 				return;
 
@@ -22,7 +27,7 @@
 				if ( tx ) {
 					tx = tx.replace( t.settings.strip, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
 					tx = tx.replace( t.settings.clean, '' );
-					tx.replace( t.settings.count, function(){tc++;} );
+					tx.replace( t.settings[type], function(){tc++;} );
 				}
 				w.html(tc.toString());