Ticket #30966: 30966.12.patch

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

@@ -1 +1 @@
 ( function() {
         function WordCounter( settings ) {
-                var key;
+                var key,
+                        shortcodes;
 
                 if ( settings ) {
                         for ( key in settings ) {
@@ -9 +10 @@
                                 }
                         }
                 }
+
+                shortcodes = this.settings.l10n.shortcodes;
+
+                if ( shortcodes && shortcodes.length ) {
+                        this.settings.shortcodesRegExp = new RegExp( '\\[\\/?(?:' + shortcodes.join( '|' ) + ')[^\\]]*?\\]', 'gi' );
+                }
         }
 
         WordCounter.prototype.settings = {
@@ -65 +72 @@
                         text = text + '\n';
 
                         text = text.replace( this.settings.HTMLRegExp, '\n' );
+                        text = text.replace( this.settings.shortcodesRegExp, '\n' );
                         text = text.replace( this.settings.spaceRegExp, ' ' );
 
                         if ( type === 'words' ) {

src/wp-includes/script-loader.php

@@ -400 +400 @@
                 /* translators: If your word count is based on single characters (East Asian characters),
                    enter 'characters', or 'all' to include spaces. Otherwise, enter 'words'.
                    Do not translate into your own language. */
-                'type' => _x( 'words', 'word count: words, characters or all?' )
+                'type' => _x( 'words', 'word count: words, characters or all?' ),
+                'shortcodes' => array_keys( $GLOBALS['shortcode_tags'] )
         ) );
 
         $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );

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

@@ -44 +44 @@
                                 words: 3,
                                 characters: 14,
                                 all: 14
+                        },
+                        {
+                                message: 'Em dash.',
+                                string: 'one [shortcode attribute="value"]two[/shortcode]three',
+                                words: 3,
+                                characters: 11,
+                                all: 12
                         }
                 ], function( test ) {
                         _.each( [ 'words', 'characters', 'all' ], function( type ) {
@@ -51 +58 @@
                         } );
                 } );
         } );
-} )( window.QUnit, new window.wp.utils.WordCounter() );
+} )( window.QUnit, new window.wp.utils.WordCounter( {
+        l10n: {
+                shortcodes: [ 'shortcode' ]
+        }
+} ) );