Changeset 33344

Timestamp:

07/21/2015 03:23:45 PM (9 years ago)

Author:

iseulde

Message:

Editor: word count: exclude HTML comments and entities

Also make sure type is one of the three allowed types and remove unnecessary regex flags.

See #30966.

Location:

trunk

Files:

• src/wp-admin/js/word-count.js (modified) (6 diffs)
• tests/qunit/wp-admin/js/word-count.js (modified) (1 diff)

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

@@ -15 +15 @@
 
         if ( shortcodes && shortcodes.length ) {
-            this.settings.shortcodesRegExp = new RegExp( '\\[\\/?(?:' + shortcodes.join( '|' ) + ')[^\\]]*?\\]', 'gi' );
+            this.settings.shortcodesRegExp = new RegExp( '\\[\\/?(?:' + shortcodes.join( '|' ) + ')[^\\]]*?\\]', 'g' );
         }
     }
@@ -21 +21 @@
     WordCounter.prototype.settings = {
         HTMLRegExp: /<\/?[a-z][^>]*?>/gi,
+        HTMLcommentRegExp: /<!--[\s\S]*?-->/g,
         spaceRegExp: /&nbsp;|&#160;/gi,
-        connectorRegExp: /--|\u2014/gi,
+        HTMLEntityRegExp: /&\S+?;/g,
+        connectorRegExp: /--|\u2014/g,
         removeRegExp: new RegExp( [
             '[',
@@ -61 +63 @@
         wordsRegExp: /\S\s+/g,
         charactersRegExp: /\S/g,
-        allRegExp: /[^\f\n\r\t\v\u00ad\u2028\u2029]/g,
+        allRegExp: /[^\f\n\r\t\v\u00AD\u2028\u2029]/g,
         l10n: window.wordCountL10n || {}
     };
@@ -68 +70 @@
         var count = 0;
 
-        type = type || this.settings.l10n.type || 'words';
+        type = type || this.settings.l10n.type;
+
+        if ( type !== 'characters' && type !== 'all' ) {
+            type = 'words';
+        }
 
         if ( text ) {
@@ -74 +80 @@
 
             text = text.replace( this.settings.HTMLRegExp, '\n' );
+            text = text.replace( this.settings.HTMLcommentRegExp, '' );
 
             if ( this.settings.shortcodesRegExp ) {
@@ -82 +89 @@
 
             if ( type === 'words' ) {
+                text = text.replace( this.settings.HTMLEntityRegExp, '' );
                 text = text.replace( this.settings.connectorRegExp, ' ' );
                 text = text.replace( this.settings.removeRegExp, '' );
             } else {
+                text = text.replace( this.settings.HTMLEntityRegExp, 'a' );
                 text = text.replace( this.settings.astralRegExp, 'a' );
             }

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

@@ -59 +59 @@
                 characters: 1,
                 all: 1
+            },
+            {
+                message: 'HTML comment.',
+                string: 'one<!-- comment -->two three',
+                words: 2,
+                characters: 11,
+                all: 12
+            },
+            {
+                message: 'HTML entity.',
+                string: '&gt; test',
+                words: 1,
+                characters: 5,
+                all: 6
             }
         ], function( test ) {