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

Update TinyMCE to the latest version #2787

Merged
merged 2 commits into from
Oct 12, 2017
Merged

Update TinyMCE to the latest version #2787

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a09ba26
Update TinyMCE to the latest version
ellatrix Oct 9, 2017
e6b1f48
Update package-lock.json per TinyMCE 4.7.1 bump
aduth Oct 12, 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
6 changes: 3 additions & 3 deletions blocks/editable/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default class Editable extends Component {
this.changeFormats = this.changeFormats.bind( this );
this.onSelectionChange = this.onSelectionChange.bind( this );
this.maybePropagateUndo = this.maybePropagateUndo.bind( this );
this.onBeforePastePreProcess = this.onBeforePastePreProcess.bind( this );
this.onPastePreProcess = this.onPastePreProcess.bind( this );
this.onPaste = this.onPaste.bind( this );

this.state = {
Expand Down Expand Up @@ -119,7 +119,7 @@ export default class Editable extends Component {
editor.on( 'keyup', this.onKeyUp );
editor.on( 'selectionChange', this.onSelectionChange );
editor.on( 'BeforeExecCommand', this.maybePropagateUndo );
editor.on( 'BeforePastePreProcess', this.onBeforePastePreProcess );
editor.on( 'PastePreProcess', this.onPastePreProcess, true /* Add before core handlers */ );
Copy link
Member

Choose a reason for hiding this comment

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

Why was this change necessary?

Copy link
Member Author

Choose a reason for hiding this comment

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

The BeforePastePreProcess event has been removed.

editor.on( 'paste', this.onPaste );

patterns.apply( this, [ editor ] );
Expand Down Expand Up @@ -204,7 +204,7 @@ export default class Editable extends Component {
this.pastedPlainText = dataTransfer ? dataTransfer.getData( 'text/plain' ) : '';
}

onBeforePastePreProcess( event ) {
onPastePreProcess( event ) {
// Allows us to ask for this information when we get a report.
window.console.log( 'Received HTML:\n\n', event.content );
window.console.log( 'Received plain text:\n\n', this.pastedPlainText );
Expand Down
2 changes: 1 addition & 1 deletion lib/client-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ function gutenberg_register_vendor_scripts() {
'https://unpkg.com/moment@2.18.1/' . $moment_script,
array( 'react' )
);
$tinymce_version = '4.6.5';
$tinymce_version = '4.7.1';
gutenberg_register_vendor_script(
'tinymce-latest',
'https://fiddle.azurewebsites.net/tinymce/' . $tinymce_version . '/tinymce' . $suffix . '.js'
Expand Down
Loading