Wordpress 3.2

[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 27aae3ccea9fd46261267bc627c9ab37d5458bc8..bb987af0ae76f44508ce873df9fb876f166e6d1c 100644 (file)
--- a/wp-admin/js/word-count.dev.js
+++ b/wp-admin/js/word-count.dev.js
@@ -1,32 +1,28 @@
-// Word count
+
 (function($) {
        wpWordCount = {
 
-               init : function() {
-                       var t = this, last = 0, co = $('#content');
-
-                       $('#wp-word-count').html( wordCountL10n.count.replace( /%d/, '<span id="word-count">0</span>' ) );
-                       t.block = 0;
-                       t.wc(co.val());
-                       co.keyup( function(e) {
-                               if ( e.keyCode == last ) return true;
-                               if ( 13 == e.keyCode || 8 == last || 46 == last ) t.wc(co.val());
-                               last = e.keyCode;
-                               return true;
-                       });
+               settings : {
+                       strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
+                       clean : /[0-9.(),;:!?%#$¿'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
+                       count : /\S\s+/g // counting regexp
                },
 
+               block : 0,
+
                wc : function(tx) {
-                       var t = this, w = $('#word-count'), tc = 0;
+                       var t = this, w = $('.word-count'), tc = 0;
+
+                       if ( t.block )
+                               return;
 
-                       if ( t.block ) return;
                        t.block = 1;
 
                        setTimeout( function() {
                                if ( tx ) {
-                                       tx = tx.replace( /<.[^<>]*?>/g, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
-                                       tx = tx.replace( /[0-9.(),;:!?%#$¿'"_+=\\/-]*/g, '' );
-                                       tx.replace( /\S\s+/g, function(){tc++;} );
+                                       tx = tx.replace( t.settings.strip, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
+                                       tx = tx.replace( t.settings.clean, '' );
+                                       tx.replace( t.settings.count, function(){tc++;} );
                                }
                                w.html(tc.toString());
 
@@ -35,5 +31,7 @@
                }
        }
 
-       $(document).ready( function(){ wpWordCount.init(); } );
+       $(document).bind( 'wpcountwords', function(e, txt) {
+               wpWordCount.wc(txt);
+       });
 }(jQuery));