Changeset 7854

Timestamp:

04/29/2008 07:17:23 PM (18 years ago)

Author:

ryan

Message:

Word count from azaozz. see #4807

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/js/word-count.js (added)
• wp-admin/page-new.php (modified) (1 diff)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/post-new.php (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -158 +158 @@
 <?php endif; ?>
 <span id="autosave"></span>
+<span id="wp-word-count"></span>
 </p>
 

trunk/wp-admin/edit-page-form.php

@@ -141 +141 @@
 <?php endif; ?>
 <span id="autosave"></span>
+<span id="wp-word-count"></span>
 </p>
 

trunk/wp-admin/page-new.php

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

trunk/wp-admin/page.php

@@ -84 +84 @@
         wp_enqueue_script('thickbox');
         wp_enqueue_script('media-upload');
+        wp_enqueue_script('word-count');
 
         if ( current_user_can('edit_page', $page_ID) ) {

trunk/wp-admin/post-new.php

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

trunk/wp-admin/post.php

@@ -91 +91 @@
         wp_enqueue_script('thickbox');
         wp_enqueue_script('media-upload');
+        wp_enqueue_script('word-count');
 
         if ( current_user_can('edit_post', $post_ID) ) {

trunk/wp-admin/wp-admin.css

@@ -1504 +1504 @@
         text-decoration: none;
 }
+
+#wp-word-count {
+        display: block;
+}

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

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

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -227 +227 @@
 if ( $disk_cache ) {
 
-        $cacheKey = apply_filters('tiny_mce_version', '20080414');
+        $cacheKey = apply_filters('tiny_mce_version', '20080423');
 
         foreach ( $initArray as $v )

trunk/wp-includes/script-loader.php

@@ -37 +37 @@
 
                 // Modify this version when tinyMCE plugins are changed.
-                $mce_version = apply_filters('tiny_mce_version', '20080414');
+                $mce_version = apply_filters('tiny_mce_version', '20080423');
                 $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
 
@@ -194 +194 @@
                                 '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' ), '20080423' );
+                        $this->localize( 'word-count', 'wordCountL10n', array(
+                                'count' => __('Word count: %d')
+                        ));
                 }
         }