Skip to content

Surface alignment toolbar as block control #987

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

Merged
aduth merged 3 commits into from
Jun 7, 2017
Merged

Surface alignment toolbar as block control #987

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad06c61
Apply changed style to TinyMCE node
aduth Jun 1, 2017
1997e78
Remove alignment controls from list block
aduth Jun 1, 2017
cb815ad
Surface alignment toolbar as block control
aduth Jun 1, 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
Next Next commit
Apply changed style to TinyMCE node
  • Loading branch information
@aduth
aduth committed Jun 7, 2017
commit ad06c610820c008486a1730055af2276d5ee8764
5 changes: 5 additions & 0 deletions blocks/editable/tinymce.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* External dependencies
*/
import tinymce from 'tinymce';
import { isEqual } from 'lodash';

export default class TinyMCE extends wp.element.Component {
componentDidMount() {
Expand All @@ -22,6 +23,10 @@ export default class TinyMCE extends wp.element.Component {
if ( this.editorNode.getAttribute( 'data-is-empty' ) !== isEmpty ) {
this.editorNode.setAttribute( 'data-is-empty', isEmpty );
}

if ( ! isEqual( this.props.style, nextProps.style ) ) {
Object.assign( this.editorNode.style, nextProps.style );
}
}

componentWillUnmount() {
Expand Down