Ticket #26620: 26620.2.diff

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

@@ -30 +30 @@
                                         tx = tx.replace( t.settings.strip, ' ' ).replace( / | /gi, ' ' );
                                         tx = tx.replace( t.settings.clean, '' );
                                         tx.replace( t.settings[type], function(){tc++;} );
+
+                                        // in the text editor, using word counting regex, when the last charector is a word charector, add one 
+                                        if ( ('.tmce-active').length !== 0  && type == 'w' && tx.charAt(tx.length-1).match(/\w/) ) 
+                                                tc++
+
                                 }
                                 w.html(tc.toString());
 

tests/qunit/index.html

@@ -14 +14 @@
 
   <!-- Tested files -->
   <script src="../../src/wp-admin/js/password-strength-meter.js"></script>
+  <script src="../../src/wp-admin/js/word-count.js"></script>
   <script src="../../src/wp-includes/js/shortcode.js"></script>
 
   <!-- Unit tests -->
   <script src="wp-admin/js/password-strength-meter.js"></script>
+  <script src="wp-admin/js/word-count.js"></script>
   <script src="wp-includes/js/shortcode.js"></script>
 
 </head>
@@ -27 +29 @@
     <h2 id="qunit-banner"></h2>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
-    <div id="qunit-fixture"></div>
+    <div id="qunit-fixture">
+                <span class='word-count'></span>        
+        </div>
   </div>
 </body>
 </html>

tests/qunit/wp-admin/js/word-count.js

@@ +1 @@
+var wordCountL10n; 
+jQuery( function() {
+        module( 'word-count' );
+
+        // This is an async test since it involves testing dom  manipulation
+        asyncTest('wpWordCount should set .word-count with the correct number of words for english language words', function(){
+                wordCountL10n = 'w'
+                wpWordCount.wc('This is some content. It should be ten words long.');
+                setTimeout(function(){
+                        // http://core.trac.wordpress.org/ticket/6991 
+                        equal(10, parseInt( jQuery('.word-count').html(), 10 ), 
+                                'the string "This is some content. It should be ten words long." shows 10');
+                        start();
+                }, 100)
+
+        });
+
+});