Skip to content

Clean up block UI logic #227

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
Mar 9, 2017
Merged

Clean up block UI logic #227

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
78 changes: 25 additions & 53 deletions tinymce-single/tinymce/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@
blocks: createBlockToolbars()
};

var anchorNode;
var range;

editor.on( 'blur', function() {
Expand All @@ -461,6 +460,10 @@
}
}

if ( node.nodeName === 'BR' ) {
node = node.parentNode;
}

// Element node.
if ( node.nodeType === 1 ) {
// Element is no direct child.
Expand Down Expand Up @@ -524,6 +527,10 @@
var settings = wp.blocks.getBlockSettingsByElement( selectedBlocks[0] ),
controls;

if ( ! settings ) {
return;
}

if ( ! hasBlockUI ) {
tinymce.$( editor.getBody() ).addClass( 'has-block-ui' );
hasBlockUI = true;
Expand All @@ -538,19 +545,21 @@
} );

if ( selectedBlocks.length === 1 ) {
if ( settings ) {
UI.blocks[ settings._id ].reposition();
focus && focusToolbar( UI.blocks[ settings._id ] );
UI.blocks[ settings._id ].reposition();
focus && focusToolbar( UI.blocks[ settings._id ] );

if ( anchorNode.nodeType === 3 ) {
UI.inline.reposition();
} else {
UI.inline.hide();
}
var selection = window.getSelection();

if ( selection.anchorNode.nodeType === 3 ) {
UI.inline.reposition();
} else {
UI.inline.hide();
}

UI.insert.reposition();
} else {
UI.blocks[ settings._id ].hide();
UI.inline.hide();
UI.insert.hide();
}

Expand All @@ -567,43 +576,10 @@
} );
}

function isInputKeyEvent( event ) {
var code = event.keyCode;
var VK = tinymce.util.VK;

if ( VK.metaKeyPressed( event ) ) {
return false;
}

// Special keys.
if ( code <= 47 && ! (
code === VK.SPACEBAR || code === VK.ENTER || code === VK.DELETE || code === VK.BACKSPACE
) ) {
return false;
}

// OS keys.
if ( code >= 91 && code <= 93 ) {
return false;
}

// Function keys.
if ( code >= 112 && code <= 123 ) {
return false;
}

// Lock keys.
if ( code >= 144 && code <= 145 ) {
return false;
}

return true;
}

var hidden = true;

editor.on( 'keydown', function( event ) {
if ( ! isInputKeyEvent( event ) ) {
if ( tinymce.util.VK.metaKeyPressed( event ) ) {
return;
}

Expand All @@ -617,29 +593,25 @@
} );

editor.on( 'selectionChange nodeChange', function( event ) {
var selection = window.getSelection();
var isCollapsed = selection.isCollapsed;
var isCollapsed = editor.selection.isCollapsed();
var startNode = editor.selection.getStart();

if ( ! selection.anchorNode ) {
if ( ! startNode ) {
return;
}

if ( selection.anchorNode.parentNode.id === 'mcepastebin' ) {
if ( startNode.id === 'mcepastebin' ) {
return;
}

if ( ! editor.getBody().contains( selection.anchorNode ) ) {
if ( ! editor.getBody().contains( startNode ) ) {
return;
}

anchorNode = selection.anchorNode;

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

if ( isEmpty ) {
window.console.log( 'Debug: empty node.' );

hideBlockUI();
UI.inline.hide();
UI.insert.reposition( { isEmpty: isEmpty } );
Expand Down