Ticket #4807: word-count2.patch

wp-admin/edit-form-advanced.php

@@ -157 +157 @@
 <br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
+<span id="wp-word-count"></span>
 </p>
 
 <div class="side-info">

wp-admin/edit-page-form.php

@@ -140 +140 @@
 <br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
+<span id="wp-word-count"></span>
 </p>
 
 <div class="side-info">

wp-admin/js/word-count.js

@@ +1 @@
+// Word count
+(function(JQ) {
+        wpWordCount = {
+        
+                init : function() {
+                var t = this, last = 0, co = JQ('#content');
+                        
+                        JQ('#wp-word-count').html( wordCountL10n.count.replace( /%d/, '<span id="word-count">0</span>' ) );
+                t.block = 0;
+                        t.wc(co.val());
+                        co.keyup( function(e) { 
+                        if ( e.keyCode == last ) return true;
+                if ( 13 == e.keyCode || 8 == last ) t.wc(co.val());
+                else if ( 32 == last ) t.fwc();
+                last = e.keyCode;
+                        return true;
+                });
+        },
+
+        wc : function(text) {
+                var t = this, w = JQ('#word-count'), co = JQ('#content');
+
+                        if ( t.block ) return;
+                t.block = 1;
+
+                setTimeout( function() {
+                var tx = JQ.trim(text), tc = 0;
+
+                if ( tx ) {
+                    tx = tx.replace( /<.[^<>]*?>/g, ' ' ) + ' ';
+                    tx = tx.replace( /[^A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff ]*/g, '' );
+                    tx.replace( /\S\s+/g, function(){tc++;} );
+                }
+                w.html(tc.toString());
+
+                setTimeout( function() { t.block = 0; }, 2000 );
+                }, 1 );
+        },
+        
+        fwc : function() {
+                var w = JQ('#word-count'), tc = parseInt(w.text()) + 1;
+                w.html( tc.toString() );
+        }
+        } 
+}(jQuery));
+
+jQuery(document).ready( function(){ wpWordCount.init(); } );

wp-admin/page-new.php

@@ -9 +9 @@
         wp_enqueue_script('editor');
 wp_enqueue_script('thickbox');
 wp_enqueue_script('media-upload');
+wp_enqueue_script('word-count');
 
 require_once('admin-header.php');
 ?>

wp-admin/page.php

@@ -83 +83 @@
                 wp_enqueue_script('editor');
         wp_enqueue_script('thickbox');
         wp_enqueue_script('media-upload');
+        wp_enqueue_script('word-count');
         if ( $last = wp_check_post_lock( $post->ID ) ) {
                 $last_user = get_userdata( $last );
                 $last_user_name = $last_user ? $last_user->display_name : __('Somebody');

wp-admin/post-new.php

@@ -9 +9 @@
         wp_enqueue_script('editor');
 wp_enqueue_script('thickbox');
 wp_enqueue_script('media-upload');
+wp_enqueue_script('word-count');
 
 require_once ('./admin-header.php');
 

wp-admin/post.php

@@ -90 +90 @@
                 wp_enqueue_script('editor');
         wp_enqueue_script('thickbox');
         wp_enqueue_script('media-upload');
+        wp_enqueue_script('word-count');
         if ( $last = wp_check_post_lock( $post->ID ) ) {
                 $last_user = get_userdata( $last );
                 $last_user_name = $last_user ? $last_user->display_name : __('Somebody');

wp-admin/wp-admin.css

@@ -1503 +1503 @@
 table.diff .diff-deletedline del, table.diff .diff-addedline ins {
         text-decoration: none;
 }
+
+#wp-word-count {
+        display: block;
+}

wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -132 +132 @@
                                 }
                         });
 
+                        // Word count if script is loaded
+                        if ( 'undefined' != typeof wpWordCount ) {
+                                var last = 0;
+                                ed.onKeyUp.add(function(ed, e) {
+                                        if ( e.keyCode == last ) return;
+                                        if ( 13 == e.keyCode || 8 == last ) wpWordCount.wc( ed.getContent({format : 'raw'}) );
+                                        else if ( 32 == last ) wpWordCount.fwc();
+                                        last = e.keyCode;
+                                });
+                        };
+
                         // Add listeners to handle more break
                         t._handleMoreBreak(ed, url);
 

wp-includes/js/tinymce/tiny_mce_config.php

@@ -223 +223 @@
 // Setup cache info
 if ( $disk_cache ) {
 
-        $cacheKey = apply_filters('tiny_mce_version', '20080414');
+        $cacheKey = apply_filters('tiny_mce_version', '20080421');
 
         foreach ( $initArray as $v )
                 $cacheKey .= $v;

wp-includes/script-loader.php

@@ -36 +36 @@
                 $this->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080325' );
 
                 // Modify this version when tinyMCE plugins are changed.
-                $mce_version = apply_filters('tiny_mce_version', '20080414');
+                $mce_version = apply_filters('tiny_mce_version', '20080421');
                 $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
 
                 $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');
@@ -193 +193 @@
                                 'edit' => __('Edit'),
                                 'cancel' => __('Cancel'),
                         ));
-                        $this->add( 'editor', '/wp-admin/js/editor.js', array('tiny_mce'), '20080221' );
+
+                        $this->add( 'word-count', '/wp-admin/js/word-count.js', array( 'jquery' ), '20080416' );
+                        $this->localize( 'word-count', 'wordCountL10n', array(
+                                'count' => __('Word count: %d')
+                        ));
                 }
         }