Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Word Count #1624

Closed
wants to merge 16 commits into from
Closed

Add Word Count #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ffd4c2f
Merge remote-tracking branch 'upstream/master'
Jun 28, 2017
7e6590b
Merge remote-tracking branch 'upstream/master'
Jun 30, 2017
fbc2154
WIP commit for wordcount
Jun 28, 2017
785f19c
Resetting changes that were addressed in master
Jun 30, 2017
907af41
reset file
Jun 30, 2017
86380f9
Getting there
Jun 30, 2017
becc7dd
Missing commit master
Jun 30, 2017
c9e9f85
Introduce WordCount component
Jun 30, 2017
a6222c4
Changing let to const
Jun 30, 2017
b058a49
Adding a space before the count
Jun 30, 2017
8b1a7bf
Properly load `word-count` dependency
nylen Jul 1, 2017
714ed93
Merge branch 'feature/post-settings-word-count' of github.com:ryanwel…
Jul 3, 2017
e8ae3c4
Merge remote-tracking branch 'upstream/master'
Jul 3, 2017
e5b8f43
Merge branch 'master' into feature/post-settings-word-count
Jul 3, 2017
a02753f
Merge remote-tracking branch 'upstream/master'
Jul 6, 2017
4ec72c7
Merge branch 'master' into feature/post-settings-word-count
Jul 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions editor/sidebar/post-settings/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import PostTaxonomies from '../post-taxonomies';
import FeaturedImage from '../featured-image';
import DiscussionPanel from '../discussion-panel';
import LastRevision from '../last-revision';
import WordCount from '../word-count';

const PostSettings = ( { toggleSidebar } ) => {
return (
Expand All @@ -37,6 +38,7 @@ const PostSettings = ( { toggleSidebar } ) => {
</div>
</PanelHeader>
<PostStatus />
<WordCount />
<LastRevision />
<PostTaxonomies />
<FeaturedImage />
Expand Down
27 changes: 27 additions & 0 deletions editor/sidebar/word-count/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* External dependencies
*/
import { connect } from 'react-redux';

/**
* WordPress dependencies
*/
import { __ } from 'i18n';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note with #2172, these need to be updated to prefix the dependencies with @wordpress/. You will need to perform a rebase against the latest version of master and apply your changes:

git fetch origin
git rebase origin/master

import PanelBody from 'components/panel/body';
import { getBlocks } from '../../selectors';
import { serialize } from 'blocks';

function WordCount( { content } ) {
const wordCount = wp.utils.WordCounter.prototype.count( content );
return (
<PanelBody><strong>{ __( 'Word Count' ) }: </strong>{ wordCount }</PanelBody>
);
}

export default connect(
( state ) => {
return {
content: serialize( getBlocks( state ) ),
};
}
)( WordCount );
13 changes: 10 additions & 3 deletions lib/client-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,16 @@ function gutenberg_editor_scripts_and_styles( $hook ) {
wp_enqueue_script(
'wp-editor',
gutenberg_url( 'editor/build/index.js' ),
array( 'wp-api', 'wp-date', 'wp-i18n', 'wp-blocks', 'wp-element', 'wp-components', 'wp-utils' ),
array(
'wp-api',
'wp-date',
'wp-i18n',
'wp-blocks',
'wp-element',
'wp-components',
'wp-utils',
'word-count',
),
filemtime( gutenberg_dir_path() . 'editor/build/index.js' ),
true // enqueue in the footer.
);
Expand All @@ -438,8 +447,6 @@ function gutenberg_editor_scripts_and_styles( $hook ) {
// `wp-utils` doesn't clobbber `word-count`. See WordPress/gutenberg#1569.
$word_count_script = wp_scripts()->query( 'word-count' );
array_push( $word_count_script->deps, 'wp-utils' );
// Now load the `word-count` script from core.
wp_enqueue_script( 'word-count' );

$post_id = null;
if ( isset( $_GET['post_id'] ) && (int) $_GET['post_id'] > 0 ) {
Expand Down