Skip to content

Commit

Permalink
Rich Text: Remove restoreContentAndSplit
Browse files Browse the repository at this point in the history
Call `onSplit` directly
  • Loading branch information
aduth committed Jun 28, 2018
1 parent 676b742 commit 1085589
Showing 1 changed file with 5 additions and 18 deletions.
23 changes: 5 additions & 18 deletions editor/components/rich-text/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ export class RichText extends Component {
const before = domToFormat( beforeNodes, format, this.editor );
const after = domToFormat( afterNodes, format, this.editor );

this.restoreContentAndSplit( before, after );
this.props.onSplit( before, after );
} else {
event.preventDefault();
this.onCreateUndoLevel();
Expand Down Expand Up @@ -603,11 +603,11 @@ export class RichText extends Component {
after = this.isEmpty( after ) ? null : after;
}

this.restoreContentAndSplit( before, after, blocks );
this.props.onSplit( before, after, ...blocks );
} else if ( context.paste ) {
this.restoreContentAndSplit( null, null, blocks );
this.props.onSplit( null, null, ...blocks );
} else {
this.restoreContentAndSplit( [], [], blocks );
this.props.onSplit( [], [], ...blocks );
}
}

Expand Down Expand Up @@ -654,7 +654,7 @@ export class RichText extends Component {
this.setContent( this.props.value );

const { format } = this.props;
this.restoreContentAndSplit(
this.props.onSplit(
domToFormat( before, format, this.editor ),
domToFormat( after, format, this.editor )
);
Expand Down Expand Up @@ -821,19 +821,6 @@ export class RichText extends Component {
} ) );
}

/**
* Calling onSplit means we need to abort the change done by TinyMCE.
* we need to call updateContent to restore the initial content before calling onSplit.
*
* @param {Array} before content before the split position
* @param {Array} after content after the split position
* @param {?Array} blocks blocks to insert at the split position
*/
restoreContentAndSplit( before, after, blocks = [] ) {
this.updateContent();
this.props.onSplit( before, after, ...blocks );
}

render() {
const {
tagName: Tagname = 'div',
Expand Down

0 comments on commit 1085589

Please sign in to comment.