Ticket #30966: 30966.6.patch

src/wp-admin/js/post.js

@@ -203 +203 @@
 jQuery(document).ready( function($) {
         var stamp, visibility, $submitButtons, updateVisibility, updateText,
                 sticky = '',
-                last = 0,
                 $textarea = $('#content'),
                 $document = $(document),
                 $editSlugWrap = $('#edit-slug-box'),
@@ -788 +787 @@
                 });
         }
 
-        // word count
-        if ( typeof(wpWordCount) != 'undefined' ) {
-                $document.triggerHandler('wpcountwords', [ $textarea.val() ]);
-
-                $textarea.keyup( function(e) {
-                        var k = e.keyCode || e.charCode;
-
-                        if ( k == last )
-                                return true;
-
-                        if ( 13 == k || 8 == last || 46 == last )
-                                $document.triggerHandler('wpcountwords', [ $textarea.val() ]);
-
-                        last = k;
-                        return true;
-                });
-        }
-
         wptitlehint = function(id) {
                 id = id || 'title';
 
@@ -935 +916 @@
                 }
         });
 });
+
+( function( $, counter ) {
+        $( function() {
+                var $content = $( '#content' ),
+                        $count = $( '#wp-word-count' ).find( '.word-count' ),
+                        prevCount = 0,
+                        contentEditor;
+
+                function update() {
+                        var text, count;
+
+                        if ( ! contentEditor || contentEditor.isHidden() ) {
+                                text = $content.val();
+                        } else {
+                                text = contentEditor.getContent( { format: 'raw' } );
+                        }
+
+                        count = counter.count( text );
+
+                        if ( count !== prevCount ) {
+                                $count.text( count );
+                        }
+
+                        prevCount = count;
+                }
+
+                $( document ).on( 'tinymce-editor-init', function( event, editor ) {
+                        if ( editor.id !== 'content' ) {
+                                return;
+                        }
+
+                        contentEditor = editor;
+
+                        editor.on( 'nodechange keyup', _.debounce( update, 500 ) );
+                } );
+
+                $content.on( 'input keyup', _.debounce( update, 500 ) );
+
+                update();
+        } );
+} )( jQuery, new wp.utils.WordCounter() );

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

@@ -1 @@
-/* global wordCountL10n */
-var wpWordCount;
-(function($,undefined) {
-        wpWordCount = {
-
-                settings : {
-                        strip : /<[a-zA-Z\/][^<>]*>/g, // strip HTML tags
-                        clean : /[0-9.(),;:!?%#$¿'"_+=\\/-]+/g, // regexp to remove punctuation, etc.
-                        w : /\S\s+/g, // word-counting regexp
-                        c : /\S/g // char-counting regexp for asian languages
-                },
-
-                block : 0,
-
-                wc : function(tx, type) {
-                        var t = this, w = $('.word-count'), tc = 0;
-
-                        if ( type === undefined )
-                                type = wordCountL10n.type;
-                        if ( type !== 'w' && type !== 'c' )
-                                type = 'w';
-
-                        if ( t.block )
-                                return;
-
-                        t.block = 1;
-
-                        setTimeout( function() {
-                                if ( tx ) {
-                                        tx = tx.replace( t.settings.strip, ' ' ).replace( /&nbsp;|&#160;/gi, ' ' );
-                                        tx = tx.replace( t.settings.clean, '' );
-                                        tx.replace( t.settings[type], function(){tc++;} );
+( function() {
+        function WordCounter( settings ) {
+                var key;
+
+                if ( settings ) {
+                        for ( key in settings ) {
+                                if ( settings.hasOwnProperty( key ) ) {
+                                        this.settings[ key ] = settings[ key ];
                                 }
-                                w.html(tc.toString());
+                        }
+                }
+        }
+
+        WordCounter.prototype.settings = {
+                HTMLRegExp: /<\/?[a-z][^>]*?>/gi,
+                spaceRegExp: /&nbsp;|&#160;/gi,
+                removeRegExp: /[0-9.(),;:!?%#$¿'"_+=\\\/-]+/g,
+                wordsRegExp: /\S\s+/g,
+                charactersRegExp: /\S/g,
+                l10n: window.wordCountL10n || {}
+        };
+
+        WordCounter.prototype.count = function( text, type ) {
+                var count = 0;
+
+                type = type || this.settings.l10n.type || 'words';
 
-                                setTimeout( function() { t.block = 0; }, 2000 );
-                        }, 1 );
+                if ( text ) {
+                        text = ' ' + text + ' ';
+
+                        text = text.replace( this.settings.HTMLRegExp, ' ' );
+                        text = text.replace( this.settings.spaceRegExp, ' ' );
+                        text = text.replace( this.settings.removeRegExp, '' );
+
+                        text = text.match( this.settings[ type + 'RegExp' ] );
+
+                        if ( text ) {
+                                count = text.length;
+                        }
                 }
+
+                return count;
         };
 
-        $(document).bind( 'wpcountwords', function(e, txt) {
-                wpWordCount.wc(txt);
-        });
-}(jQuery));
+        window.wp = window.wp || {};
+        window.wp.utils = window.wp.utils || {};
+        window.wp.utils.WordCounter = WordCounter;
+} )();

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -7 +7 @@
         var DOM = tinymce.DOM,
                 each = tinymce.each,
                 __ = editor.editorManager.i18n.translate,
-                wpAdvButton, style,
-                last = 0;
+                wpAdvButton, style;
 
         if ( typeof window.jQuery !== 'undefined' ) {
                 window.jQuery( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] );
@@ -363 +362 @@
                 }
         });
 
-        // Word count
-        if ( typeof window.jQuery !== 'undefined' ) {
-                editor.on( 'keyup', function( e ) {
-                        var key = e.keyCode || e.charCode;
-
-                        if ( key === last ) {
-                                return;
-                        }
-
-                        if ( 13 === key || 8 === last || 46 === last ) {
-                                window.jQuery( document ).triggerHandler( 'wpcountwords', [ editor.getContent({ format : 'raw' }) ] );
-                        }
-
-                        last = key;
-                });
-        }
-
         editor.on( 'SaveContent', function( e ) {
                 // If editor is hidden, we just want the textarea's value to be saved
                 if ( ! editor.inline && editor.isHidden() ) {

src/wp-includes/script-loader.php

@@ -371 +371 @@
 
         $scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
 
-        $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), false, 1 );
+        $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array(
                 /* translators: If your word count is based on single characters (East Asian characters),
                    enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
-                'type' => 'characters' == _x( 'words', 'word count: words or characters?' ) ? 'c' : 'w',
+                'type' => _x( 'words', 'word count: words or characters?' )
         ) );
 
         $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
@@ -451 +451 @@
                         'tagDelimiter' => _x( ',', 'tag delimiter' ),
                 ) );
 
-                $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box' ), false, 1 );
+                $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count' ), false, 1 );
                 did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
                         'ok' => __('OK'),
                         'cancel' => __('Cancel'),

tests/qunit/index.html

@@ -32 +32 @@
                 <script src="../../src/wp-includes/js/customize-models.js"></script>
                 <script src="../../src/wp-includes/js/shortcode.js"></script>
                 <script src="../../src/wp-admin/js/customize-controls.js"></script>
+                <script src="../../src/wp-admin/js/word-count.js"></script>
 
                 <!-- Unit tests -->
                 <script src="wp-admin/js/password-strength-meter.js"></script>
@@ -40 +41 @@
                 <script src="wp-includes/js/shortcode.js"></script>
                 <script src="wp-admin/js/customize-controls.js"></script>
                 <script src="wp-admin/js/customize-controls-utils.js"></script>
+                <script src="wp-admin/js/word-count.js"></script>
 
                 <!-- Customizer templates for sections -->
                 <script type="text/html" id="tmpl-customize-section-default">