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

Move figcaption button to block registration #232

Merged
merged 1 commit into from
Mar 10, 2017
Merged

Move figcaption button to block registration #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 1 deletion tinymce-single/blocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@

// Has placeholder for text.
if ( brs.length ) {
editor.selection.setCursorLocation( brs[0].parentNode, 0 );
if ( brs[0].parentNode.getAttribute( 'contenteditable' ) === 'true' ) {
editor.selection.select( brs[0].parentNode );
} else {
editor.selection.setCursorLocation( brs[0].parentNode, 0 );
}
} else {
editor.selection.select( block );
}
Expand Down
19 changes: 18 additions & 1 deletion tinymce-single/blocks/core/image/register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,24 @@ window.wp.blocks.registerBlock( {
'block-align-center',
'block-align-right',
'block-align-full',
'togglefigcaption'
{
icon: 'gridicons-caption',
onClick: function( block ) {
var figcaption = block.querySelector( 'figcaption' );

if ( figcaption ) {
block.removeChild( figcaption );
} else {
block.insertAdjacentHTML( 'beforeend',
'<figcaption contenteditable="true"><br></figcaption>' );
}

window.wp.blocks.selectBlock( block );
},
isActive: function( block ) {
return !! block.querySelector( 'figcaption' );
}
}
],
insert: function() {
return (
Expand Down
74 changes: 10 additions & 64 deletions tinymce-single/tinymce/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,52 +46,6 @@
editor.addButton( name, settings );
} );

function addfigcaption() {
var block = getSelectedBlock();

if ( ! editor.$( block ).find( 'figcaption' ).length ) {
var figcaption = editor.$( '<figcaption contenteditable="true"><br></figcaption>' );

editor.undoManager.transact( function() {
editor.$( block ).append( figcaption );
editor.selection.setCursorLocation( figcaption[0], 0 );
} );
}
}

function removefigcaption() {
var block = getSelectedBlock();
var figcaption = editor.$( block ).find( 'figcaption' );

if ( figcaption.length ) {
editor.undoManager.transact( function() {
figcaption.remove();
} );
}
}

editor.addButton( 'togglefigcaption', {
icon: 'gridicons-caption',
onClick: function() {
var block = getSelectedBlock();

if ( editor.$( block ).find( 'figcaption' ).length ) {
removefigcaption();
} else {
addfigcaption();
}
},
onPostRender: function() {
var button = this;

editor.on( 'nodechange', function( event ) {
var block = getSelectedBlock();

button.active( editor.$( block ).find( 'figcaption' ).length > 0 );
} );
}
} );

// Attach block UI.

editor.on( 'preinit', function() {
Expand Down Expand Up @@ -290,7 +244,6 @@

window.tinymce.ui.WPInsertSeparator = tinymce.ui.Control.extend( {
renderHtml: function() {
console.log(this)
return (
'<div id="' + this._id + '" class="insert-separator">' + this.settings.text + '</div>'
);
Expand Down Expand Up @@ -662,28 +615,21 @@
var VK = tinymce.util.VK;
var block = getSelectedBlock();

if ( block.nodeName === 'FIGURE' ) {
if ( keyCode === VK.ENTER ) {
addfigcaption();
event.preventDefault();
}
} else {
if ( keyCode === VK.BACKSPACE ) {
var selection = window.getSelection();

if ( ! selection.isCollapsed && editor.dom.isBlock( selection.focusNode ) ) {
if ( selection.anchorOffset === 0 && selection.focusOffset === 0 ) {
if ( block.nextSibling && block.nextSibling.contains( selection.focusNode ) ) {
removeBlock();
event.preventDefault();
}
}
if ( keyCode === VK.BACKSPACE ) {
var selection = window.getSelection();

if ( selection.anchorOffset === 0 && selection.anchorNode === selection.focusNode ) {
if ( ! selection.isCollapsed && editor.dom.isBlock( selection.focusNode ) ) {
if ( selection.anchorOffset === 0 && selection.focusOffset === 0 ) {
if ( block.nextSibling && block.nextSibling.contains( selection.focusNode ) ) {
removeBlock();
event.preventDefault();
}
}

if ( selection.anchorOffset === 0 && selection.anchorNode === selection.focusNode ) {
removeBlock();
event.preventDefault();
}
}
}

Expand Down