From 8d9679804391189e9401a9c3cf278df5f23636cb Mon Sep 17 00:00:00 2001 From: azaozz Date: Wed, 22 Apr 2009 09:29:43 +0000 Subject: [PATCH] wordcount.js fix for nbsp passed as #160 char, props Denis-de-Bernardy, fixes #9597 git-svn-id: http://svn.automattic.com/wordpress/trunk@11050 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/word-count.dev.js | 2 +- wp-admin/js/word-count.js | 2 +- wp-includes/script-loader.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/js/word-count.dev.js b/wp-admin/js/word-count.dev.js index 2207f758aa..27aae3ccea 100644 --- a/wp-admin/js/word-count.dev.js +++ b/wp-admin/js/word-count.dev.js @@ -24,7 +24,7 @@ setTimeout( function() { if ( tx ) { - tx = tx.replace( /<.[^<>]*?>/g, ' ' ).replace( / /gi, ' ' ); + tx = tx.replace( /<.[^<>]*?>/g, ' ' ).replace( / | /gi, ' ' ); tx = tx.replace( /[0-9.(),;:!?%#$¿'"_+=\\/-]*/g, '' ); tx.replace( /\S\s+/g, function(){tc++;} ); } diff --git a/wp-admin/js/word-count.js b/wp-admin/js/word-count.js index 6384eba717..8c935d4175 100644 --- a/wp-admin/js/word-count.js +++ b/wp-admin/js/word-count.js @@ -1 +1 @@ -(function(a){wpWordCount={init:function(){var b=this,c=0,d=a("#content");a("#wp-word-count").html(wordCountL10n.count.replace(/%d/,'0'));b.block=0;b.wc(d.val());d.keyup(function(f){if(f.keyCode==c){return true}if(13==f.keyCode||8==c||46==c){b.wc(d.val())}c=f.keyCode;return true})},wc:function(d){var e=this,c=a("#word-count"),b=0;if(e.block){return}e.block=1;setTimeout(function(){if(d){d=d.replace(/<.[^<>]*?>/g," ").replace(/ /gi," ");d=d.replace(/[0-9.(),;:!?%#$¿'"_+=\\/-]*/g,"");d.replace(/\S\s+/g,function(){b++})}c.html(b.toString());setTimeout(function(){e.block=0},2000)},1)}};a(document).ready(function(){wpWordCount.init()})}(jQuery)); \ No newline at end of file +(function(a){wpWordCount={init:function(){var b=this,c=0,d=a("#content");a("#wp-word-count").html(wordCountL10n.count.replace(/%d/,'0'));b.block=0;b.wc(d.val());d.keyup(function(f){if(f.keyCode==c){return true}if(13==f.keyCode||8==c||46==c){b.wc(d.val())}c=f.keyCode;return true})},wc:function(d){var e=this,c=a("#word-count"),b=0;if(e.block){return}e.block=1;setTimeout(function(){if(d){d=d.replace(/<.[^<>]*?>/g," ").replace(/ | /gi," ");d=d.replace(/[0-9.(),;:!?%#$¿'"_+=\\/-]*/g,"");d.replace(/\S\s+/g,function(){b++})}c.html(b.toString());setTimeout(function(){e.block=0},2000)},1)}};a(document).ready(function(){wpWordCount.init()})}(jQuery)); \ No newline at end of file diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 0a03f66971..1d3594393f 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -333,7 +333,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable' ), '20090413a' ); $scripts->add_data( 'admin-widgets', 'group', 1 ); - $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), '20090102' ); + $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), '20090422' ); $scripts->add_data( 'word-count', 'group', 1 ); $scripts->localize( 'word-count', 'wordCountL10n', array( 'count' => __('Word count: %d'),