WordPress 3.4

[autoinstalls/wordpress.git] / 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 bb987af0ae76f44508ce873df9fb876f166e6d1c..b42f5c3b49b554ec61b5fed8f56bc26f29bcea01 100644 (file)
--- 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());