Skip to content

Commit

Permalink
Update TinyMCE to the latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
ellatrix committed Oct 9, 2017
1 parent 0fde369 commit a09ba26
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 69 deletions.
6 changes: 3 additions & 3 deletions blocks/editable/index.js
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 */ );
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
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ function gutenberg_register_vendor_scripts() {
'https://unpkg.com/[email protected]/' . $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

0 comments on commit a09ba26

Please sign in to comment.