Skip to content

Fix icon display of blocks #141

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
ellatrix merged 1 commit into from
Feb 27, 2017
Merged

Fix icon display of blocks #141

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
2 changes: 1 addition & 1 deletion tinymce-single/blocks/core/gallery/register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ window.wp.blocks.register( {
namespace: 'core',
type: 'image',
keywords: [],
icon: 'gridicons-image',
icon: 'gridicons-image-multiple',
buttons: [
'block-align-left',
'block-align-center',
Expand Down
44 changes: 24 additions & 20 deletions tinymce-single/tinymce/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,21 @@
if ( settings.elements ) {
settings.elements.forEach( function( element ) {
_settings[ 'element:' + element ] = settings;
_settings[ 'element:' + element ]._id = 'element:' + element;
} );
} else if ( settings.namespace && settings.name ) {
_settings[ settings.namespace + ':' + settings.name ] = settings;
_settings[ settings.namespace + ':' + settings.name ]._id = settings.namespace + ':' + settings.name;
}
},
getSettings: function( id ) {
return _settings[ id ];
},
getSettingsByElement( element ) {
var blockType = element.getAttribute( 'data-wp-block-type' );
var nodeName = element.nodeName.toLowerCase();

return this.getSettings( blockType || 'element:' + nodeName );
}
};
} )( window.wp = window.wp || {} );
Expand Down Expand Up @@ -98,7 +106,7 @@
} );
} )( window.wp.blocks.register );

( function( tinymce ) {
( function( tinymce, wp ) {
tinymce.PluginManager.add( 'block', function( editor ) {
function focusToolbar( toolbar ) {
var node = toolbar.find( 'toolbar' )[0];
Expand Down Expand Up @@ -325,13 +333,7 @@

editor.on( 'nodechange', function( event ) {
element = event.parents[ event.parents.length - 1 ];

tinymce.each( editor.settings.blocks, function( block, key ) {
if ( block.match( element ) ) {
button.icon( block.icon || '' );
button.text( block.text || '' );
}
} );
button.icon( wp.blocks.getSettingsByElement( element ).icon );
} );
}
});
Expand Down Expand Up @@ -504,23 +506,20 @@
}

function showBlockUI( focus ) {
blockToolbar.reposition();
var settings = wp.blocks.getSettingsByElement( element );

var name = element.getAttribute( 'data-wp-block-type' ) || 'element:' + element.nodeName.toLowerCase();
var settings = wp.blocks.getSettings( name );

console.log(name, settings);
blockToolbar.reposition();

tinymce.each( blockToolbars, function( toolbar, key ) {
if ( key !== name ) {
if ( key !== settings._id ) {
toolbar.hide();
}
} );

if ( settings ) {
if ( ! blockToolbars[ name ] ) {
blockToolbars[ name ] = editor.wp._createToolbar( settings.buttons.concat( [ 'block-remove' ] ) );
blockToolbars[ name ].reposition = function () {
if ( ! blockToolbars[ settings._id ] ) {
blockToolbars[ settings._id ] = editor.wp._createToolbar( settings.buttons.concat( [ 'block-remove' ] ) );
blockToolbars[ settings._id ].reposition = function () {
if (!element) return

var toolbar = this.getEl();
Expand All @@ -540,8 +539,8 @@
editor.nodeChanged(); // Update UI.
}

blockToolbars[ name ].reposition();
focus && focusToolbar( blockToolbars[ name ] );
blockToolbars[ settings._id ].reposition();
focus && focusToolbar( blockToolbars[ settings._id ] );
}
}

Expand All @@ -559,6 +558,11 @@
var selection = window.getSelection();
var isCollapsed = selection.isCollapsed;
var anchorNode = selection.anchorNode;

if ( ! anchorNode ) {
return;
}

var isEmpty = isCollapsed && isEmptySlot( anchorNode );
var isBlockUIVisible = ! hidden;

Expand Down Expand Up @@ -675,4 +679,4 @@
} );
} );
} );
} )( window.tinymce );
} )( window.tinymce, window.wp );