Changeset 33299

Timestamp:

07/16/2015 09:08:05 PM (9 years ago)

Author:

iseulde

Message:

Editor: word count: exclude shortcodes

Props desaiuditd, adamsilverstein, azaozz and iseulde.
Fixes #27386. See #30966.

Location:

trunk

Files:

• src/wp-admin/js/word-count.js (modified) (3 diffs)
• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/qunit/wp-admin/js/word-count.js (modified) (2 diffs)

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

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

trunk/src/wp-includes/script-loader.php

@@ -401 +401 @@
            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' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
     ) );
 

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

@@ -45 +45 @@
                 characters: 14,
                 all: 14
+            },
+            {
+                message: 'Shortcodes.',
+                string: 'one [shortcode attribute="value"]two[/shortcode]three',
+                words: 3,
+                characters: 11,
+                all: 12
             }
         ], function( test ) {
@@ -52 +59 @@
         } );
     } );
-} )( window.QUnit, new window.wp.utils.WordCounter() );
+} )( window.QUnit, new window.wp.utils.WordCounter( {
+    l10n: {
+        shortcodes: [ 'shortcode' ]
+    }
+} ) );